From patchwork Mon Jul 19 14:51:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479961 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4246639jao; Mon, 19 Jul 2021 08:44:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwS6+ua74bbBJneF8CSDOE7uhtN9XUAbd7WZCvUXyaf0WMCeMYBNrT3n4JovTEhJObGGu7i X-Received: by 2002:a05:6638:270c:: with SMTP id m12mr22518394jav.5.1626709355009; Mon, 19 Jul 2021 08:42:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709355; cv=none; d=google.com; s=arc-20160816; b=0n7fTOCcSMZ1hB0LD57sEKNRdTeXP4hoPAGcB6kQOOvwaueFlxsx7DKR/ahJ8V0svf J21VI/l7xnzglZgTBPRJy+o0nCl4GtWKtjYwEh07G4Vd5XWP404Lk//9DMHcZogiijB+ 5NLLnSmUt4D+oTz1u3PNlf7PKeADWc3L+akWQHutmDUjYwylkXDZdKeMcBBjVcwuIWpQ sC1f8FRJ9l+RJq3TwaU6RsY/vQ3Wk2IqcjHw/FK97Momg6RNkgX0shQcwyjHGt0gcQ0N q8cXGWCLfBc0N6ESZVmdQ6bDP7kT0n0k94AWlWmo0VmvKyVO94VZy1yG4e3FI3sAxh3i rr8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QmpsXnHUxn/yotfH3icreO5rvH6RzP/KKPTh+Cphafw=; b=lCJhMLMfCbdgQK09r8XxzCF9ArIyq4dRipL6R9w3B9n0WNsgRwsRqdgwhzdYwxHWxm lghLMAaHWU/szzY1ThRdz4BcPyXcR9114BrJrC4ferhJAVPScNBLKzYVGGiu5P6gyIi0 yrSMk/iRV+hv6V09744LQLUhJnD4V1gKHUbS6xhG4FHs8P8JjHpxu9Bdj/CyVuOsT+ax DuBX3gwn3BFY1YdUgmDoNFQrqW5Venes0+ldeIublvV+xViwJcclDZeCNCttUEEyn1W8 vclTJgmija9MsbCDIGe9bHe6SjR/1GYo2Rk1XhDcQpkFEmSAAEXZjvjFJikuduLqvzjD KcqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eib3sDA8; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ay16si21406520jab.96.2021.07.19.08.42.34; Mon, 19 Jul 2021 08:42:35 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eib3sDA8; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344755AbhGSPBn (ORCPT + 12 others); Mon, 19 Jul 2021 11:01:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:58464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345086AbhGSPAI (ORCPT ); Mon, 19 Jul 2021 11:00:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B06D960238; Mon, 19 Jul 2021 15:40:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709247; bh=CE9WRDPLlDR03lER8/mTJcmkXpgXwNwxvO4b1bRlssQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eib3sDA8Pu6Jcqt0AVsyshnYYdz5q6ciohuCegYhjRWFvS67OhGrAnsIXR8hFX9oT AIXtyPTLKl7woXTfyoTJBg4F54uAtceVtMkC9VBYnLZzvJrhK0d+nWecdN2X3x/M6y wxu/q+GWCJ/vUgSm7iqQm4IfbxDqmnspHR7rn2Ss= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Laurent Pinchart , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.19 308/421] media: subdev: disallow ioctl for saa6588/davinci Date: Mon, 19 Jul 2021 16:51:59 +0200 Message-Id: <20210719144957.008628218@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 0a7790be182d32b9b332a37cb4206e24fe94b728 upstream. The saa6588_ioctl() function expects to get called from other kernel functions with a 'saa6588_command' pointer, but I found nothing stops it from getting called from user space instead, which seems rather dangerous. The same thing happens in the davinci vpbe driver with its VENC_GET_FLD command. As a quick fix, add a separate .command() callback pointer for this driver and change the two callers over to that. This change can easily get backported to stable kernels if necessary, but since there are only two drivers, we may want to eventually replace this with a set of more specialized callbacks in the long run. Fixes: c3fda7f835b0 ("V4L/DVB (10537): saa6588: convert to v4l2_subdev.") Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann Reviewed-by: Laurent Pinchart Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/saa6588.c | 4 ++-- drivers/media/pci/bt8xx/bttv-driver.c | 6 +++--- drivers/media/pci/saa7134/saa7134-video.c | 6 +++--- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/davinci/vpbe_venc.c | 6 ++---- include/media/v4l2-subdev.h | 4 ++++ 6 files changed, 15 insertions(+), 13 deletions(-) --- a/drivers/media/i2c/saa6588.c +++ b/drivers/media/i2c/saa6588.c @@ -392,7 +392,7 @@ static void saa6588_configure(struct saa /* ---------------------------------------------------------------------- */ -static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) +static long saa6588_command(struct v4l2_subdev *sd, unsigned int cmd, void *arg) { struct saa6588 *s = to_saa6588(sd); struct saa6588_command *a = arg; @@ -445,7 +445,7 @@ static int saa6588_s_tuner(struct v4l2_s /* ----------------------------------------------------------------------- */ static const struct v4l2_subdev_core_ops saa6588_core_ops = { - .ioctl = saa6588_ioctl, + .command = saa6588_command, }; static const struct v4l2_subdev_tuner_ops saa6588_tuner_ops = { --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -3243,7 +3243,7 @@ static int radio_release(struct file *fi btv->radio_user--; - bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd); + bttv_call_all(btv, core, command, SAA6588_CMD_CLOSE, &cmd); if (btv->radio_user == 0) btv->has_radio_tuner = 0; @@ -3324,7 +3324,7 @@ static ssize_t radio_read(struct file *f cmd.result = -ENODEV; radio_enable(btv); - bttv_call_all(btv, core, ioctl, SAA6588_CMD_READ, &cmd); + bttv_call_all(btv, core, command, SAA6588_CMD_READ, &cmd); return cmd.result; } @@ -3345,7 +3345,7 @@ static __poll_t radio_poll(struct file * cmd.instance = file; cmd.event_list = wait; cmd.poll_mask = res; - bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd); + bttv_call_all(btv, core, command, SAA6588_CMD_POLL, &cmd); return cmd.poll_mask; } --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c @@ -1202,7 +1202,7 @@ static int video_release(struct file *fi saa_call_all(dev, tuner, standby); if (vdev->vfl_type == VFL_TYPE_RADIO) - saa_call_all(dev, core, ioctl, SAA6588_CMD_CLOSE, &cmd); + saa_call_all(dev, core, command, SAA6588_CMD_CLOSE, &cmd); mutex_unlock(&dev->lock); return 0; @@ -1221,7 +1221,7 @@ static ssize_t radio_read(struct file *f cmd.result = -ENODEV; mutex_lock(&dev->lock); - saa_call_all(dev, core, ioctl, SAA6588_CMD_READ, &cmd); + saa_call_all(dev, core, command, SAA6588_CMD_READ, &cmd); mutex_unlock(&dev->lock); return cmd.result; @@ -1237,7 +1237,7 @@ static __poll_t radio_poll(struct file * cmd.event_list = wait; cmd.poll_mask = 0; mutex_lock(&dev->lock); - saa_call_all(dev, core, ioctl, SAA6588_CMD_POLL, &cmd); + saa_call_all(dev, core, command, SAA6588_CMD_POLL, &cmd); mutex_unlock(&dev->lock); return rc | cmd.poll_mask; --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -60,7 +60,7 @@ static int venc_is_second_field(struct v ret = v4l2_subdev_call(vpbe_dev->venc, core, - ioctl, + command, VENC_GET_FLD, &val); if (ret < 0) { --- a/drivers/media/platform/davinci/vpbe_venc.c +++ b/drivers/media/platform/davinci/vpbe_venc.c @@ -534,9 +534,7 @@ static int venc_s_routing(struct v4l2_su return ret; } -static long venc_ioctl(struct v4l2_subdev *sd, - unsigned int cmd, - void *arg) +static long venc_command(struct v4l2_subdev *sd, unsigned int cmd, void *arg) { u32 val; @@ -555,7 +553,7 @@ static long venc_ioctl(struct v4l2_subde } static const struct v4l2_subdev_core_ops venc_core_ops = { - .ioctl = venc_ioctl, + .command = venc_command, }; static const struct v4l2_subdev_video_ops venc_video_ops = { --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -171,6 +171,9 @@ struct v4l2_subdev_io_pin_config { * @s_gpio: set GPIO pins. Very simple right now, might need to be extended with * a direction argument if needed. * + * @command: called by in-kernel drivers in order to call functions internal + * to subdev drivers driver that have a separate callback. + * * @ioctl: called at the end of ioctl() syscall handler at the V4L2 core. * used to provide support for private ioctls used on the driver. * @@ -202,6 +205,7 @@ struct v4l2_subdev_core_ops { int (*load_fw)(struct v4l2_subdev *sd); int (*reset)(struct v4l2_subdev *sd, u32 val); int (*s_gpio)(struct v4l2_subdev *sd, u32 val); + long (*command)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); #ifdef CONFIG_COMPAT long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd,