From patchwork Fri Nov 22 10:26:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179970 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp24023ilf; Fri, 22 Nov 2019 02:41:45 -0800 (PST) X-Google-Smtp-Source: APXvYqyYKnwQm8WMn5W7woRrL8QBQhVPcZFV79usuIz+1rWmll6FqPedR/wyOX0u5MyDcCtIpXiT X-Received: by 2002:aa7:d2cf:: with SMTP id k15mr214025edr.267.1574419305660; Fri, 22 Nov 2019 02:41:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419305; cv=none; d=google.com; s=arc-20160816; b=ZSOw23eTiDtlKzcQ2qbgxZjbkxbWkwnKhIfvMTbi3n/rTGNBm+6kYbDDpXBWu3cVDy YBxaDRr5yvpbZwFtgYK0NkOCoqcHOI9nzt2xv9/qRQ/0HClkumTtNTt929mzGWcKrXs6 i0nPLvv5uHVvEbmsnGpLTvZbV3xyh5AmlHfk6nnIP6rTMazY/+PkYF8tiqfr/5VMa2CR moc7Jjg4azr5VTXFO6371fcY7LCiQgeBSLvb0SXHOAtQHwSZkLLr0KiLAB+ozrjcmmRo 7YhX+OtZvv5ycu0+z1k1luBxFMk3jIKoeEokg1wnzvI92jbFwKTtOeMFO04ZMyk/6jaa UeAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KAGf1zByShAApED2imxkmh3R9y3EqJH4YefC6WmNOAA=; b=AQ6xq/TnokwSS3u4WpGckG8K3jnLIV5z0kA1XHVMhV0qYHes9kieyIqxJD779UczZK 7Ai8lg09/EPOm7J0fNEZaau8c3oQv/eoQhqBBtx9cDw1G5eINGV0y/5vynbwNVm+7C2G AaKLaFh3PK0ZIKGLOZ4oNnm09bUHYQDkVTjwnBIr18TCS9vKbfxm4Qw1QJ6TZ91rjwGH 08xmNV+Lj15bK+luGT67xMi9HgAEnhQ3aSvQnA3S+rZyUyY0dII46c32StLfplN/D7nW EXHGgALBTfhFwd5wVoe6A3qkqEdTolzpGgv6iKoiEDx7nc2a0k32npGfNGePr7Bp9QZY xfCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZDUcfbw1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t11si3889525eju.106.2019.11.22.02.41.45; Fri, 22 Nov 2019 02:41:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZDUcfbw1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729034AbfKVKln (ORCPT + 26 others); Fri, 22 Nov 2019 05:41:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:46336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727107AbfKVKll (ORCPT ); Fri, 22 Nov 2019 05:41:41 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EC9C52071F; Fri, 22 Nov 2019 10:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419300; bh=pK3JiVdDG4pG661QQcM6zzwb4qeK05/7/x0H6NkhWIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZDUcfbw13LFTrti5GW8nq6IRPQNrQOE2Gt3xCf9CvNBSeOSWF7bshiBsSZOIdGdFN 3O4vmKZmYCrJGs9krbPCjcAYb7L3Q5iaMZ/VH17Xl8xl9niQKy1Vcgbr9ASRV615iP 0dlgXNTPGRTCbVEjw9GlGYjfZ30/WfZOu1RD2GOQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 063/222] media: dvb: fix compat ioctl translation Date: Fri, 22 Nov 2019 11:26:43 +0100 Message-Id: <20191122100900.539626447@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 1ccbeeb888ac33627d91f1ccf0b84ef3bcadef24 ] The VIDEO_GET_EVENT and VIDEO_STILLPICTURE was added back in 2005 but it never worked because the command number is wrong. Using the right command number means we have a better chance of them actually doing the right thing, though clearly nobody has ever tried it successfully. I noticed these while auditing the remaining users of compat_time_t for y2038 bugs. This one is fine in that regard, it just never did anything. Fixes: 6e87abd0b8cb ("[DVB]: Add compat ioctl handling.") Signed-off-by: Arnd Bergmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- fs/compat_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 4b7da4409c60c..5b832e83772a6 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -160,6 +160,7 @@ struct compat_video_event { unsigned int frame_rate; } u; }; +#define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event) static int do_video_get_event(struct file *file, unsigned int cmd, struct compat_video_event __user *up) @@ -171,7 +172,7 @@ static int do_video_get_event(struct file *file, if (kevent == NULL) return -EFAULT; - err = do_ioctl(file, cmd, (unsigned long)kevent); + err = do_ioctl(file, VIDEO_GET_EVENT, (unsigned long)kevent); if (!err) { err = convert_in_user(&kevent->type, &up->type); err |= convert_in_user(&kevent->timestamp, &up->timestamp); @@ -190,6 +191,7 @@ struct compat_video_still_picture { compat_uptr_t iFrame; int32_t size; }; +#define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture) static int do_video_stillpicture(struct file *file, unsigned int cmd, struct compat_video_still_picture __user *up) @@ -212,7 +214,7 @@ static int do_video_stillpicture(struct file *file, if (err) return -EFAULT; - err = do_ioctl(file, cmd, (unsigned long) up_native); + err = do_ioctl(file, VIDEO_STILLPICTURE, (unsigned long) up_native); return err; } @@ -1484,9 +1486,9 @@ static long do_ioctl_trans(unsigned int cmd, return rtc_ioctl(file, cmd, argp); /* dvb */ - case VIDEO_GET_EVENT: + case VIDEO_GET_EVENT32: return do_video_get_event(file, cmd, argp); - case VIDEO_STILLPICTURE: + case VIDEO_STILLPICTURE32: return do_video_stillpicture(file, cmd, argp); case VIDEO_SET_SPU_PALETTE: return do_video_set_spu_palette(file, cmd, argp);