Received: by 2002:a05:6520:4d:b0:139:a872:a4c9 with SMTP id i13csp2566835lkm; Mon, 20 Sep 2021 18:53:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEAb47TRVqQgK4evbQDgX4JzLSR9UZ5VyfZpOnRDrf6aXsPqTzmkCM2xUdyGL9N1b2diUF X-Received: by 2002:a50:bf49:: with SMTP id g9mr9140885edk.262.1632188899182; Mon, 20 Sep 2021 18:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632188899; cv=none; d=google.com; s=arc-20160816; b=i50Y3roqHIu0zCFt0JfHyKqP+rR4hAV1KJGhpwDdkHCY+FyCir97WO/aRJGmeu01o2 FNcYxI84REgWEjRdC+FWc+Fvj/kosIbf/7YJdIqkGkp+0LDFbZMoZA4AUHw8QEkVBAe9 aqlbkNu32k/90NGOMPqxzW8Kj5TxZ8U0eWztuL87wVOXwxKf1MrbUbkXBnSe3Nr1qExs hjZNG9oLqkO22GmM5kab2c623L4XshECQTS2V0KX3CeXEW3PSfswQ5ErTiC/b7iqsjvY Fus9K+T0EdNBwfBh8TSdX7SJkOjnBD3KoI55NAa53h3av7EYqZVFsL0zx7hTgW0I9PvW alKg== 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=fw4V9DzPlMt3MaFbwU+Sl3GGAQaLNHNIyKjWNemmkuk=; b=o2E1RNd51nK/0qZEysMR/RizDav6Nbj3joy1GOun4Tb96Y2qn8VlpJG/hiEM3vPmXV HuFrnb/bHaVDEoVGzAQ7pglMpClxcqIhFtv+KC5Tg4D3wQ2CC+zXoombNOiNDsjmjrZz g7PC9sDUWBOQ5eckyuVkTSnQHfDBPHU73/rJO/L/0oqYKcORY/sgK3nmXSpcvdSUNfi/ iPNQYOg5oG3cqiswupIwUv/HVC3CNIjWlr2asFP/2bkN+fTOZV8I1f4hqYhBW4eMeV4M h34psRJIVOz+nexYodMyi+Rt3UpRrCJ97IfiFdi0UB5uKlW6M37B0RinKRgewkD6NrWO iHWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KXWy3tzc; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d19si17639939edq.331.2021.09.20.18.47.56; Mon, 20 Sep 2021 18:48:19 -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=pass header.i=@linuxfoundation.org header.s=korg header.b=KXWy3tzc; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344424AbhITR0K (ORCPT + 99 others); Mon, 20 Sep 2021 13:26:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:55134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346058AbhITRXV (ORCPT ); Mon, 20 Sep 2021 13:23:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0642A613A9; Mon, 20 Sep 2021 17:01:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157298; bh=K8pMz4GG5vZ4j7mBHnBy4fP4BXnwbBH0ttasQhiXOb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KXWy3tzcNxieY2GMbP9RM1jqzU0Sykyx0jGW+nkaM3KPK1e5NbgzINtpgiELW0+v/ jA94ejh6OlzXV7tYNp+5f3HE3Cng8z2c3IgtPuTjItOy2wZjBncnVTyWtzY8tU5gDi CdbuiK/Ii5WckuqPYhjezouNNDI3x5TQX8moBXqQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laurent Pinchart , Mauro Carvalho Chehab Subject: [PATCH 4.14 112/217] media: uvc: dont do DMA on stack Date: Mon, 20 Sep 2021 18:42:13 +0200 Message-Id: <20210920163928.436721549@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163924.591371269@linuxfoundation.org> References: <20210920163924.591371269@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mauro Carvalho Chehab commit 1a10d7fdb6d0e235e9d230916244cc2769d3f170 upstream. 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 Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/uvc/uvc_v4l2.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -876,8 +876,8 @@ static int uvc_ioctl_g_input(struct file { 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)) { @@ -885,22 +885,27 @@ static int uvc_ioctl_g_input(struct file 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); - if (ret < 0) - return ret; + buf, 1); + if (!ret) + *input = *buf - 1; - *input = i - 1; - return 0; + kfree(buf); + + return ret; } 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; + u8 *buf; int ret; - u32 i; ret = uvc_acquire_privileges(handle); if (ret < 0) @@ -916,10 +921,17 @@ static int uvc_ioctl_s_input(struct file 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,