From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50E7EC76186 for ; Wed, 24 Jul 2019 20:25:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D429214AF for ; Wed, 24 Jul 2019 20:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563999955; bh=ZRvTLBsOsX/CSd8fgTOQwvG+WLa4P8denGfxzcrCE0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qbMfcZc/RRKq3+X8MLx9yRaMhjMqcxKcGtOZX3h77Q1fIxeWych8/bB7EBJHX/zvm UdXVzonvcjtXPgj0rTNuqpPLiBljRj6WBBJG6PlmNO3si8m832rXwpA+aiZcU+60nH HDVGzCYXIdAgKzhyzriCg6G9sr7k6iCKDbCFHGzY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389758AbfGXTi2 (ORCPT ); Wed, 24 Jul 2019 15:38:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:39026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389660AbfGXTi0 (ORCPT ); Wed, 24 Jul 2019 15:38:26 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 90FCF20665; Wed, 24 Jul 2019 19:38:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997105; bh=ZRvTLBsOsX/CSd8fgTOQwvG+WLa4P8denGfxzcrCE0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fWjST/iplEebPEZ614Iq8mbn/Ea8SfALIJrk36i/QDzexjNNB5iw7PTTylLjYPQah rvjhpzX/5bhSEq9l0Kz3cEnzpMntXe9umNZcZzT2UZZsvyLUTAxsSwn3DZDoihTyLL nkNWah+vF1uwGO/2CER1bqq5GZ583+33t5FL/kBQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Boris Brezillon , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.2 322/413] media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom() Date: Wed, 24 Jul 2019 21:20:13 +0200 Message-Id: <20190724191758.913962268@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Boris Brezillon commit 07d89227a983df957a6a7c56f7c040cde9ac571f upstream. cfg->type can be overridden by v4l2_ctrl_fill() and the new value is stored in the local type var. Fix the tests to use this local var. Fixes: 0996517cf8ea ("V4L/DVB: v4l2: Add new control handling framework") Cc: Signed-off-by: Boris Brezillon [hverkuil-cisco@xs4all.nl: change to !qmenu and !qmenu_int (checkpatch)] Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/v4l2-ctrls.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -2369,16 +2369,15 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(s v4l2_ctrl_fill(cfg->id, &name, &type, &min, &max, &step, &def, &flags); - is_menu = (cfg->type == V4L2_CTRL_TYPE_MENU || - cfg->type == V4L2_CTRL_TYPE_INTEGER_MENU); + is_menu = (type == V4L2_CTRL_TYPE_MENU || + type == V4L2_CTRL_TYPE_INTEGER_MENU); if (is_menu) WARN_ON(step); else WARN_ON(cfg->menu_skip_mask); - if (cfg->type == V4L2_CTRL_TYPE_MENU && qmenu == NULL) + if (type == V4L2_CTRL_TYPE_MENU && !qmenu) { qmenu = v4l2_ctrl_get_menu(cfg->id); - else if (cfg->type == V4L2_CTRL_TYPE_INTEGER_MENU && - qmenu_int == NULL) { + } else if (type == V4L2_CTRL_TYPE_INTEGER_MENU && !qmenu_int) { handler_set_err(hdl, -EINVAL); return NULL; }