Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3790059pxj; Mon, 21 Jun 2021 06:42:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw34aEqS3GGDPMRT+9bQz9T8XI5UKgYzhLNQlOfZcoe/XhijeWZ6Oro+GJFEKTAyofZ2cD9 X-Received: by 2002:a05:6e02:1c2c:: with SMTP id m12mr2193296ilh.94.1624282957419; Mon, 21 Jun 2021 06:42:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624282957; cv=none; d=google.com; s=arc-20160816; b=vDYtpCv+lXvnMeR4gsBtSp37h8urOsLevT3DQi+lWgfyP3pDZjMsgl0VxlxVyekxhU Bmt+sx6LeQrtoYLwWswLPfeIfca8QZ4IJMXpm8YVWKHvqIfVF+2fPBDUM7GU8AdvM1NG 9Ob40ebKl8tvtrHgKYR+zkGpxrDUjrbwzgB4u0GDrS9/xcdsEA2xsUl4N4UVsABl0amP v4hbkUxWhWV5Iq62tc+e+BXhz7ZhptOxTnfwxqNpH8ULSw1G8opm6ecH4QgmeXRd64FD jgmOskMWZXE9/ACYSsipsE928tBumUKAh4MzZVK0jSKX/nhR5HzG51RDL7VknRtgdMDi jiGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:from:dkim-signature; bh=oCwQ5jbVD8O9ePTZUv8EKNkfixq8y31RdWZpd8zfwgE=; b=SjFaAcuz/9IP/RyERAx/plF4nqDRvbckAWOT0bp39ChLKczBsey/zLBXsbYh7p5MSJ tZC0AL2lKV07SAU1cAUviMzl2P/zqlkcClzuhGGx7YI1lIdqXLMPMsbcOrc3ryMggIjc ptaeAmbmL+j6oWys0uefb+HrzWd63OxosrdQmQkG+RFy/S4opv7jyQoxv+exeMAVbo1y 8zHcUwd9ZBpmriWc2bJFI0pf00Ihg4MG6T+q25XFIhIGRdPounzKYqa7B0IIXp0GlkOq EfhjIENRiJx0+Db3SY5vrRBjhGDhPxyeUbkut1v4zEklFSqg5ufzXOiJcwbB9oyWay4m eObQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=T1HubzRd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n5si13778304ilj.6.2021.06.21.06.42.23; Mon, 21 Jun 2021 06:42:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=T1HubzRd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230057AbhFUNmg (ORCPT + 99 others); Mon, 21 Jun 2021 09:42:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:54022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229747AbhFUNmg (ORCPT ); Mon, 21 Jun 2021 09:42:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3952860249; Mon, 21 Jun 2021 13:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624282822; bh=aE54vXBYYOVCHakiOGtog1mXWNcJcvFeTWSP6fhuM3U=; h=From:To:Cc:Subject:Date:From; b=T1HubzRdhe1LRsPGuzPq7InSfeB2JKVuRo1mq/860M4Z0oDGUbb0XXxhtQ9Hlq5Q8 F7Tkku86s8s4c8kqQ+sKq7kpYO6xISdm/sVgTU5MVuRzp5VFeftxMyAlltIw9fBemg MnBU0+7u4RLDNLopGN5+P6E7CVIb+DeVKHONZ/oRKcUWzuRQRvqC4oFY51Z5v8yMHa KuFn/x4fSa4cd1JAv5t4efijeFJElKQFf7BXgYFOy+cDbBqD4hj/M/bbiSTUhXxtxx JkunG/w9PEorO6l4AaMPsye6SZ5fXMO70rZehqaf7BOw0vTCzCMLhh7BvhImjO65lq 5RZPE6Zo4KomQ== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1lvK9z-000XhC-WB; Mon, 21 Jun 2021 15:40:20 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Laurent Pinchart , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3] media: uvc: don't do DMA on stack Date: Mon, 21 Jun 2021 15:40:19 +0200 Message-Id: <6832dffafd54a6a95b287c4a1ef30250d6b9237a.1624282817.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As warned by smatch: drivers/media/usb/uvc/uvc_v4l2.c:911 uvc_ioctl_g_input() error: doing dma on the stack (&i) drivers/media/usb/uvc/uvc_v4l2.c:943 uvc_ioctl_s_input() error: doing dma on the stack (&i) those two functions call uvc_query_ctrl passing a pointer to a data at the DMA stack. those are used to send URBs via usb_control_msg(). Using DMA stack is not supported and should not work anymore on modern Linux versions. So, use a kmalloc'ed buffer. Cc: stable@vger.kernel.org # Kernel 4.9 and upper Signed-off-by: Mauro Carvalho Chehab --- drivers/media/usb/uvc/uvc_v4l2.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 252136cc885c..a95bf7318848 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -899,8 +899,8 @@ static int uvc_ioctl_g_input(struct file *file, void *fh, unsigned int *input) { struct uvc_fh *handle = fh; struct uvc_video_chain *chain = handle->chain; + u8 *buf; int ret; - u8 i; if (chain->selector == NULL || (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) { @@ -908,13 +908,20 @@ static int uvc_ioctl_g_input(struct file *file, void *fh, unsigned int *input) return 0; } + buf = kmalloc(1, GFP_KERNEL); + if (!buf) + return -ENOMEM; + ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, chain->selector->id, chain->dev->intfnum, UVC_SU_INPUT_SELECT_CONTROL, - &i, 1); + buf, 1); if (ret < 0) return ret; - *input = i - 1; + *input = *buf - 1; + + kfree(buf); + return 0; } @@ -922,8 +929,8 @@ static int uvc_ioctl_s_input(struct file *file, void *fh, unsigned int input) { struct uvc_fh *handle = fh; struct uvc_video_chain *chain = handle->chain; + char *buf; int ret; - u32 i; ret = uvc_acquire_privileges(handle); if (ret < 0) @@ -939,10 +946,17 @@ static int uvc_ioctl_s_input(struct file *file, void *fh, unsigned int input) if (input >= chain->selector->bNrInPins) return -EINVAL; - i = input + 1; - return uvc_query_ctrl(chain->dev, UVC_SET_CUR, chain->selector->id, - chain->dev->intfnum, UVC_SU_INPUT_SELECT_CONTROL, - &i, 1); + buf = kmalloc(1, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + *buf = input + 1; + ret = uvc_query_ctrl(chain->dev, UVC_SET_CUR, chain->selector->id, + chain->dev->intfnum, UVC_SU_INPUT_SELECT_CONTROL, + buf, 1); + kfree(buf); + + return ret; } static int uvc_ioctl_queryctrl(struct file *file, void *fh, -- 2.31.1