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 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 995C2C433B4 for ; Wed, 28 Apr 2021 08:53:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5792F61289 for ; Wed, 28 Apr 2021 08:53:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237110AbhD1Iyk (ORCPT ); Wed, 28 Apr 2021 04:54:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:42878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229643AbhD1Iyj (ORCPT ); Wed, 28 Apr 2021 04:54:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C5D3D61407; Wed, 28 Apr 2021 08:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619600035; bh=hIpoZCyQYqJ1W4QWID6HiWD7AXuql4uvapgp7+4BJbg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IsbfUnhUi56l/pW+1emnqKZ+vju/MM6AynrMhbYN8Fogi2aHyTE4O4bhtRlZXBPz3 4ghzvY5aOY9Z6toKZs+9igsxyRdHHls4XpsIynOn9rjxEtAmDr/45JkNDNElsDgakB lkR4AkQfuopt7objZwosN7+XiuAxai33dxyoCJa8= Date: Wed, 28 Apr 2021 10:53:52 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Kangjie Lu , Philipp Zabel , Hans Verkuil , Mauro Carvalho Chehab Subject: Re: [PATCH 102/190] Revert "media: video-mux: fix null pointer dereferences" Message-ID: References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> <20210421130105.1226686-103-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421130105.1226686-103-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 02:59:37PM +0200, Greg Kroah-Hartman wrote: > This reverts commit aeb0d0f581e2079868e64a2e5ee346d340376eae. > > 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: Philipp Zabel > Cc: Hans Verkuil > Cc: Mauro Carvalho Chehab > Signed-off-by: Greg Kroah-Hartman > --- > drivers/media/platform/video-mux.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c > index 133122e38515..a754e20850c2 100644 > --- a/drivers/media/platform/video-mux.c > +++ b/drivers/media/platform/video-mux.c > @@ -442,14 +442,9 @@ static int video_mux_probe(struct platform_device *pdev) > vmux->active = -1; > vmux->pads = devm_kcalloc(dev, num_pads, sizeof(*vmux->pads), > GFP_KERNEL); > - if (!vmux->pads) > - return -ENOMEM; > - > vmux->format_mbus = devm_kcalloc(dev, num_pads, > sizeof(*vmux->format_mbus), > GFP_KERNEL); > - if (!vmux->format_mbus) > - return -ENOMEM; > > for (i = 0; i < num_pads; i++) { > vmux->pads[i].flags = (i < num_pads - 1) ? MEDIA_PAD_FL_SINK > -- > 2.31.1 > This looks correct, dropping from revert list. greg k-h