From patchwork Thu Jul 25 12:48:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 11058773 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 977FE6C5 for ; Thu, 25 Jul 2019 12:48:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82E1028949 for ; Thu, 25 Jul 2019 12:48:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 729DE2882A; Thu, 25 Jul 2019 12:48:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED63E2882A for ; Thu, 25 Jul 2019 12:48:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388497AbfGYMs1 (ORCPT ); Thu, 25 Jul 2019 08:48:27 -0400 Received: from lb2-smtp-cloud7.xs4all.net ([194.109.24.28]:34473 "EHLO lb2-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389308AbfGYMs1 (ORCPT ); Thu, 25 Jul 2019 08:48:27 -0400 Received: from [IPv6:2001:420:44c1:2579:64cb:e917:d1ce:4f27] ([IPv6:2001:420:44c1:2579:64cb:e917:d1ce:4f27]) by smtp-cloud7.xs4all.net with ESMTPA id qdAThEXC8LqASqdAXhTlKs; Thu, 25 Jul 2019 14:48:25 +0200 To: Linux Media Mailing List Cc: Jan Kotas , Sakari Ailus From: Hans Verkuil Subject: [PATCH] v4l2-dev: fix WARN_ON(!vdev->device_caps) Message-ID: Date: Thu, 25 Jul 2019 14:48:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 Content-Language: en-US X-CMAE-Envelope: MS4wfJCXSpU889EeWLIEA/kc+SNMbxroN4ulexPRFMJETk8PxTjhd4rBJWjXJfDs7deY0sv4pw3gmDZ0j+fiq1RdhVRNXfofGa9ZoGGsgiQz2ubOCKdG/0vG 0crT9fBamchjzBCZRpPGvwnLCNg6rr74fq27EjSzQOOVp5DO9/Eo65YLMPEGQr5L7Oschwqo35oSBwgd1l9RVNxMXXDNFIpnGtTYFCBGas4jq1JPnrUudDz8 CCAu2rbVIh0UMGydxFus5dwuSvRautVcwW7neXqeVSO29K0Ok8CUqcEXSkHGrz3qmr6C4JqOpyXIAdyT6YeYiswcsFM3GWwnWN1BrJ2dSsMf4pkSBum7Ps77 +/nRljik Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Device nodes of type VFL_TYPE_SUBDEV have a 0 device_caps, so they trigger this warning. Add a check against VFL_TYPE_SUBDEV. Signed-off-by: Hans Verkuil Fixes: 3c1350501c21 ("media: v4l2-dev/ioctl: require non-zero device_caps, verify sane querycap results") Reported-by: Jan Kotas diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index 3af72e3bbd65..a1c61d6f3b9b 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -859,8 +859,8 @@ int __video_register_device(struct video_device *vdev, /* the v4l2_dev pointer MUST be present */ if (WARN_ON(!vdev->v4l2_dev)) return -EINVAL; - /* the device_caps field MUST be set */ - if (WARN_ON(!vdev->device_caps)) + /* the device_caps field MUST be set for all but subdevs */ + if (WARN_ON(type != VFL_TYPE_SUBDEV && !vdev->device_caps)) return -EINVAL; /* v4l2_fh support */