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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 3070FC433DF for ; Thu, 20 Aug 2020 17:00:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 148AA207BB for ; Thu, 20 Aug 2020 17:00:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729012AbgHTRAZ (ORCPT ); Thu, 20 Aug 2020 13:00:25 -0400 Received: from cnc.isely.net ([75.149.91.89]:51183 "EHLO cnc.isely.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726749AbgHTRAU (ORCPT ); Thu, 20 Aug 2020 13:00:20 -0400 X-Greylist: delayed 305 seconds by postgrey-1.27 at vger.kernel.org; Thu, 20 Aug 2020 13:00:20 EDT Received: from cnc-c.isely.net ([::ffff:75.149.91.89]) (AUTH: PLAIN isely, TLS: TLSv1/SSLv3,256bits,DHE-RSA-AES256-SHA) by cnc.isely.net with ESMTPSA; Thu, 20 Aug 2020 11:55:13 -0500 id 0000000000126070.000000005F3EAAF1.00001768 Date: Thu, 20 Aug 2020 11:55:13 -0500 (CDT) From: Mike Isely Reply-To: Mike Isely at pobox To: Tong Zhang cc: mchehab@kernel.org, linux-media@vger.kernel.org, Linux Kernel Mailing List , Hans Verkuil , Mike Isely at pobox Subject: Re: [PATCH v3] media: pvrusb2: fix parsing error In-Reply-To: <20200820165239.8510-1-ztong0001@gmail.com> Message-ID: References: <20200820165239.8510-1-ztong0001@gmail.com> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Acked-by: Mike Isely On Thu, 20 Aug 2020, Tong Zhang wrote: > pvr2_std_str_to_id() returns 0 on failure and 1 on success, > however the caller is checking failure case using <0 > > Co-developed-by: Hans Verkuil > Signed-off-by: Tong Zhang > --- > > v2: return -EINVAL as suggested by Hans Verkuil. > I also rebased the code on v5.9-rc1. > v3: remove unused variable > > drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c > index 1cfb7cf64131..f4a727918e35 100644 > --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c > +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c > @@ -864,10 +864,9 @@ static int ctrl_std_sym_to_val(struct pvr2_ctrl *cptr, > const char *bufPtr,unsigned int bufSize, > int *mskp,int *valp) > { > - int ret; > v4l2_std_id id; > - ret = pvr2_std_str_to_id(&id,bufPtr,bufSize); > - if (ret < 0) return ret; > + if (!pvr2_std_str_to_id(&id, bufPtr, bufSize)) > + return -EINVAL; > if (mskp) *mskp = id; > if (valp) *valp = id; > return 0; > -- Mike Isely isely @ isely (dot) net PGP: 03 54 43 4D 75 E5 CC 92 71 16 01 E2 B5 F5 C1 E8