Received: by 10.213.65.68 with SMTP id h4csp709428imn; Wed, 28 Mar 2018 11:20:27 -0700 (PDT) X-Google-Smtp-Source: AIpwx48Imbhu/zF2pWLFl++NU9nDJq3MKCJWh59FzVpc+bltT2IrO6SVZfGnUQz3jUMUyDl69ydk X-Received: by 10.101.82.12 with SMTP id o12mr3264294pgp.126.1522261226940; Wed, 28 Mar 2018 11:20:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522261226; cv=none; d=google.com; s=arc-20160816; b=utDw/KMVoRn3QgJAPfHXzOmzlWwP0OIWOhsa06YfnkX5IvWu8eXlxY4+148WRidyz0 SfvYLn9JeXWazoNG4arPSIaPosfaPGgdPPEt28YV4YqaPfxglhbYfKmAE5bO6nMYAB+x sImiL4UN8vw8+OxJMzIXx7bBG8c05pXWUb0/dy/RSYTR7aepLoxyY1v53+ioiNhNVGNv M5Y3l4H652cNIV3YzXE9V60syBuOxL1kucEr8yiQXxmylssto/0ppNLL5eVWxTIvZ8/C FDCpJpOi98Ukw/yub45u7hwhbucvoLB5COmTL2o321vQhvqm1feT+/GqCiOkoeZHi+Lh JQdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=CkMpwrNo5hkDupeZh6OclbPcS4y3QYS6Km+Q06+DK9A=; b=EyshCVGwBKEp8lVWycm6A967QGOZy/+Ec8G0e+3o/cuUOVn2uPiPitQU6n8tcDZu6s Ew099zk0bNzPJShXt5x4vlUQ1T+43TDNUmRXPz+wJwcdPeEqwSr4n9cnHAisV6044A2U bdv885xxXIqE57E2xW5/Gku3mVwRV5zowfxmMEPymHUUfZE8raaU5Bi+wQKf+hkILFNh e/BNG2/ZLY86ELpXyS9pJCin7lFksgcW600wxBD6sU25hloO8HAQf0V3DpQPVJPNDFBh 7IQ/+dGLZ0Zlukdd6rwMgIgmtiAF6tX7HFb3xPk5tOX7iuEhHm5wtJa7tUh+W/jA1+gr o/Ow== ARC-Authentication-Results: i=1; mx.google.com; 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 e11si2814853pgr.231.2018.03.28.11.20.12; Wed, 28 Mar 2018 11:20:26 -0700 (PDT) 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; 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 S1753353AbeC1SMv (ORCPT + 99 others); Wed, 28 Mar 2018 14:12:51 -0400 Received: from osg.samsung.com ([64.30.133.232]:49062 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752318AbeC1SMs (ORCPT ); Wed, 28 Mar 2018 14:12:48 -0400 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id 58F973B4FE; Wed, 28 Mar 2018 11:12:48 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at dev.s-opensource.com X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from osg.samsung.com ([127.0.0.1]) by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UCjfmbs5FK-n; Wed, 28 Mar 2018 11:12:40 -0700 (PDT) Received: from smtp.s-opensource.com (177.205.88.90.dynamic.adsl.gvt.net.br [177.205.88.90]) by osg.samsung.com (Postfix) with ESMTPSA id 82FD33B4CF; Wed, 28 Mar 2018 11:12:40 -0700 (PDT) Received: from mchehab by smtp.s-opensource.com with local (Exim 4.90_1) (envelope-from ) id 1f1FYs-0005Ja-Bx; Wed, 28 Mar 2018 15:12:38 -0300 From: Mauro Carvalho Chehab To: Linux Media Mailing List , stable@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Linux Kernel Mailing List , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH for v3.18 09/18] media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs Date: Wed, 28 Mar 2018 15:12:28 -0300 Message-Id: <39d6997be9988f81bce42a00115b062aac7b0a51.1522260310.git.mchehab@s-opensource.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil commit 273caa260035c03d89ad63d72d8cd3d9e5c5e3f1 upstream. If the device is of type VFL_TYPE_SUBDEV then vdev->ioctl_ops is NULL so the 'if (!ops->vidioc_query_ext_ctrl)' check would crash. Add a test for !ops to the condition. All sub-devices that have controls will use the control framework, so they do not have an equivalent to ops->vidioc_query_ext_ctrl. Returning false if ops is NULL is the correct thing to do here. Fixes: b8c601e8af ("v4l2-compat-ioctl32.c: fix ctrl_is_pointer") Signed-off-by: Hans Verkuil Acked-by: Sakari Ailus Reported-by: Laurent Pinchart Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c index c78462e79a0a..bd4890769e0b 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -600,7 +600,7 @@ static inline bool ctrl_is_pointer(struct file *file, u32 id) return ctrl && ctrl->is_ptr; } - if (!ops->vidioc_query_ext_ctrl) + if (!ops || !ops->vidioc_query_ext_ctrl) return false; return !ops->vidioc_query_ext_ctrl(file, fh, &qec) && -- 2.14.3