From patchwork Tue Nov 19 05:16:29 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: 179641 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp153670ilf; Mon, 18 Nov 2019 21:32:14 -0800 (PST) X-Google-Smtp-Source: APXvYqwiiNeVZKqAQ4Tu5qBdU+R5ccIDJL07z0m3tecSHFAD2z5AwJdnNe/t2wiMpifFT6Svlau2 X-Received: by 2002:a17:906:24d4:: with SMTP id f20mr33394628ejb.182.1574141533851; Mon, 18 Nov 2019 21:32:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141533; cv=none; d=google.com; s=arc-20160816; b=vR8/qa0BOxqHA0vqxNI+wAUP722dYgD6SdPC3dBLZiI2PqJ+9UAgyYn+uMicFwol8U GlbuTWwR5J1xjzS2/++/vqVgUSTb9XKdPMvFS1XgroHoMrw1XLNZNVeHeASuWJOmQ8Ft cn8xJZVIzynsQqpofg+raOiWtGgWCkTZG9P+CdxoAXG7VxRELNvf6Yg2S454MvtCeDjY FfwId/LSomvuxf0UdMtOSDWXE301WVb827RsEqUJS7z+0NzSSh/AsNVMFka288XNfBWF jtErYn8AufEtHmBPwgVkFHKB+qlhQYsTVKIc1S6lMMk3qWV4mwGOxTnSsv8hhAfotS46 yhDA== 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=GtSFdeCXzVeJGjs3lQv0h4jp41Tf+f1Ri84rJrz6Fn4=; b=o3HkJh1sijVtKyHLDEwLSFyZigSOm09aBK6MRgLEWDTrCzyGNsSdBS0ari5VGJPeee mRjoRhcyRF+vR7bG0SAyjuCcK9NHMfKB5i1jQHxf6ZLGXVrjDPsiLGGYSvUXTkmqLpDY T68sPEFn1g8NYb7kXAek/u8XZ2U3DC+wsRMt3PHSZ7QDcgeMa7u9JAnBCBmML31+//fc ncNH/Tzd6BcuwHScKRkquIz9hqAjTpTj8t6j0c2lJx+671NWUf584unuj2VCC5FdXzFe BtnziLMFlsCEaDBGTv8tIaCpGPAFj/WPeYu2OXd9pqOk7lwS502GQf2DKcqet56KlKRQ VUQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=j5mpFpeZ; 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 i18si5882386edt.319.2019.11.18.21.32.12; Mon, 18 Nov 2019 21:32:13 -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=j5mpFpeZ; 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 S1729362AbfKSFcK (ORCPT + 26 others); Tue, 19 Nov 2019 00:32:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:52292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727532AbfKSFcJ (ORCPT ); Tue, 19 Nov 2019 00:32:09 -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 6770421823; Tue, 19 Nov 2019 05:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141527; bh=KoIC1QyqhyN8DmbL2eUSeFGN3iQb5ME2i+EKkEFOJQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j5mpFpeZwEyyIOotLk5xen3Z6OVPsDs7foLNPIMfh5kJLot433CCYHVjUoNk8imCk i4ffzKaVnlknlNavxRCv6OQOm21QZQxhhfXP3E5iULrnJkkul7wtluYEY4xWFd9Lu5 3g00z89goM6d3N8CX9w6JIoHLWX6jCOCDrg0MxEo= 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.19 192/422] media: dvb: fix compat ioctl translation Date: Tue, 19 Nov 2019 06:16:29 +0100 Message-Id: <20191119051410.987106078@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@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 8f08095ee54e9..3a03f74a8cc4e 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -141,6 +141,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) @@ -152,7 +153,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); @@ -171,6 +172,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) @@ -193,7 +195,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; } @@ -1302,9 +1304,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); }