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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 3CE9CC433ED for ; Tue, 27 Apr 2021 13:24:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E94E6613B0 for ; Tue, 27 Apr 2021 13:24:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236280AbhD0NZO (ORCPT ); Tue, 27 Apr 2021 09:25:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:56262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236008AbhD0NZN (ORCPT ); Tue, 27 Apr 2021 09:25:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5546860FD8; Tue, 27 Apr 2021 13:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619529870; bh=JXDRNlXLZpJFQol+KTPuA/3OzaJAO9gAwg5E774vJkE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=G/z8N7CNn15YUb1OdZH6kIgTwxHKUmv7rC3bfhgFdDwV1mltoA9j/h/QQYtkZdikk 8sWwxUtITuPuVJCgozjcS/o2SlAvEj1MCq05vVL58NHzhNk9i2KlNzeoXwiqA7bwoG T3u3ZwBQgj8jHq1d0GE2N50KL3zuFeuRTyOhvv4w= Date: Tue, 27 Apr 2021 15:24:27 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Kangjie Lu , Mauro Carvalho Chehab Subject: Re: [PATCH 153/190] Revert "media: usb: gspca: add a missed return-value check for do_command" Message-ID: References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> <20210421130105.1226686-154-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421130105.1226686-154-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 03:00:28PM +0200, Greg Kroah-Hartman wrote: > This reverts commit 5ceaf5452c1b2a452dadaf377f9f07af7bda9cc3. > > Commits from @umn.edu addresses have been found to be submitted in "bad > faith" to try to test the kernel community's ability to review "known > malicious" changes. The result of these submissions can be found in a > paper published at the 42nd IEEE Symposium on Security and Privacy > entitled, "Open Source Insecurity: Stealthily Introducing > Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University > of Minnesota) and Kangjie Lu (University of Minnesota). > > Because of this, all submissions from this group must be reverted from > the kernel tree and will need to be re-reviewed again to determine if > they actually are a valid fix. Until that work is complete, remove this > change to ensure that no problems are being introduced into the > codebase. > > Cc: Kangjie Lu > Cc: Mauro Carvalho Chehab > Signed-off-by: Greg Kroah-Hartman > --- > drivers/media/usb/gspca/cpia1.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c > index d93d384286c1..99e594559a0c 100644 > --- a/drivers/media/usb/gspca/cpia1.c > +++ b/drivers/media/usb/gspca/cpia1.c > @@ -537,14 +537,10 @@ static int do_command(struct gspca_dev *gspca_dev, u16 command, > } > if (sd->params.qx3.button) { > /* button pressed - unlock the latch */ > - ret = do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, > + do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, > 3, 0xdf, 0xdf, 0); > - if (ret) > - return ret; > - ret = do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, > + do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, > 3, 0xff, 0xff, 0); > - if (ret) > - return ret; > } > > /* test whether microscope is cradled */ > -- > 2.31.1 > This looks correct, I'll drop the revert. But ick, recursion? What could go wrong.... greg k-h