From patchwork Thu Jun 10 21:43:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 457874 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp13785jae; Thu, 10 Jun 2021 14:45:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNQBBv9WXH4w9I/3ufJ4ynJYlmG0+yy1vZ98L6+X/k70KkkDQoRA3c+iy6rffCO0lBbn3j X-Received: by 2002:a17:906:5407:: with SMTP id q7mr560573ejo.158.1623361541423; Thu, 10 Jun 2021 14:45:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623361541; cv=none; d=google.com; s=arc-20160816; b=l9QseBU0rer2ktGCAR7DA6tQoh6czOHpdKv1V1JEGztXIioT1syCOFU86PXe6mR5GO kY0InrpH+5yEa85/IJpWlUTDXL/J7N5DINiyOLmMum+sZVvreWIghXmDrZgBcykJXP4T 3ppzGEJ29Kt67mzisA1rZ0pLMwxByslzF/dbIoW33A9GUMR3ct8gnSSWs0SfVRqRtT3a CtqfXm1s0fF5X40RyRVErJ3XuSxlDV57APOU/brNNmH5pLNtF37hVtZq/o6Vf+d+fFaR LURiT9/MtZQ3sXpCSuxtp8Tyj3edHi9TtoY0ijOiuS+drBHSTPxxav1dD2duXQ9TRFvV /8sQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JxB2SuRppArzh4BKAjO3t8SyLJIEZgLApk6uXXf9wkg=; b=NB7TByqigT0FneFasD3Mn6El7RSUzbBqu9W4KQlECwZBR8KoDFG7+frAXMMR8WvTUl kJT1B7z2Q9L6dNoTPsJLy0oMQ7PganPhnuavi80nhUbA4KqZZBvPtC3rj4eXNCPcCbGn /HaSme0lzqleCQUmyXDnI9EWgWr73yIcTDPH7dne3Sun+6bpnoYR2iK5AGzmG7OsSKrp ZqfODh7WfO1UhrVmLnTQw+TwwKY6Gjd17+plYlDcvRllcacM5q2YbPOgFbJXmkGVdZ9M e1gebvkKUr5ie7jrEQjx0XVlSbXQeIQOf7b6vwXl+x//A+4j4SvNc1vf98dW8N0Za5d9 KgQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bk+P31Vc; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-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 j6si3052531edv.294.2021.06.10.14.45.41; Thu, 10 Jun 2021 14:45:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-media-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=@kernel.org header.s=k20201202 header.b=bk+P31Vc; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-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 S230504AbhFJVrB (ORCPT + 4 others); Thu, 10 Jun 2021 17:47:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:54276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230487AbhFJVrA (ORCPT ); Thu, 10 Jun 2021 17:47:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 19B1F613CA; Thu, 10 Jun 2021 21:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623361503; bh=P0W2KJ4lzuzwWS6G/VqMgKtWboi7bu1bEPiy8Gk27bA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bk+P31Vcczg79DOEhKZYLisjfWMS1pomZiAAU6ijgXlVDNL419cxL0Ic3e+ajxpQt VEjQUmlUnmuaAr8tbZ7uFUohE9EEY5zJawTfyO3VJbC6FIVu1WHSYXTmCNWQKn4uEU lbjRyvYti+7w2lUQd1e4/Z60ZbjyvwvO3zAHllXBscZo02phLxDMk4PwEDE4O3aJM0 TLSZXLCuNjMu+OgbFSaZjGf2brQPx/kszy4OaIIwIegN1hLeYeFrUisfbe5n7pLGEI EmaT9Th2KRaqom9BjblutrBcd2+TRIYjkMVeFFVUyqVjKJlC5noWmWQ1uUZtM12TmZ l4tsbpLM8WL3Q== From: Arnd Bergmann To: Hans Verkuil , Mauro Carvalho Chehab Cc: Arnd Bergmann , "Lad, Prabhakar" , Eduardo Valentin , Sakari Ailus , Greg Kroah-Hartman , Vaibhav Gupta , Liu Shixin , Laurent Pinchart , Jacopo Mondi , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v2 4/7] media: v4l2-core: return -ENODEV from ioctl when not registered Date: Thu, 10 Jun 2021 23:43:02 +0200 Message-Id: <20210610214305.4170835-5-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610214305.4170835-1-arnd@kernel.org> References: <20210610214305.4170835-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Arnd Bergmann I spotted a minor difference is handling of unregistered devices between native and compat ioctls: the native handler never tries to call into the driver if a device is not marked as registered. I did not check whether this can cause issues in the kernel, or just a different between return codes, but it clearly makes sense that both should behave the same way. Signed-off-by: Arnd Bergmann --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.29.2 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c index 0ca75f6784c5..47aff3b19742 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -1244,6 +1244,9 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) if (!file->f_op->unlocked_ioctl) return ret; + if (!video_is_registered(vdev)) + return -ENODEV; + if (_IOC_TYPE(cmd) == 'V' && _IOC_NR(cmd) < BASE_VIDIOC_PRIVATE) ret = file->f_op->unlocked_ioctl(file, cmd, (unsigned long)compat_ptr(arg));