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=-0.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 4F139C2BA19 for ; Wed, 15 Apr 2020 13:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B5B22076D for ; Wed, 15 Apr 2020 13:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586959118; bh=LAdOSb1Hjqwf4+j8zNmxLNvXaq1YaYHqZ2SFWUbpB2g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=EcyPCkF7PV4D0GcmSEvRc/n0+29lRk5mIWf4Bo0ths3tZXu+CZFDdOzGUWdwfY2jt 5PRWLFXC3+LSA1qMNRcw64tquohXDfyIG9tp2DzKVA2DIWM84Hj44hcfFt89lOIBrS IRFBymTOKxbFz/hp1c/UL63X23htHI7qC0RYSsUI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2633876AbgDON6b (ORCPT ); Wed, 15 Apr 2020 09:58:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:43242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2633783AbgDON6Y (ORCPT ); Wed, 15 Apr 2020 09:58:24 -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 119C72074F; Wed, 15 Apr 2020 13:58:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586959103; bh=LAdOSb1Hjqwf4+j8zNmxLNvXaq1YaYHqZ2SFWUbpB2g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Azg7QKIe5BxOfrXVs63/TSNDLrC5odfsEXYcVgG0SuckxyapS3TsCjHjIc1QBkg/j 682NKMqnIK2cdyHEOUbN1LAbrzvuEiYxc/9uur9jiRH3uPtHliAQOkOgsGmg72tdyy QTzSV8nlb4vu6w+QH78jFa+F8xQdX7Gwb2QzXzsI= Date: Wed, 15 Apr 2020 15:58:21 +0200 From: Greg KH To: Sakari Ailus Cc: stable@vger.kernel.org, david@unsolicited.net, hans.verkuil@cisco.com, linux@roeck-us.net, mchehab@osg.samsung.com, stable-commits@vger.kernel.org Subject: Re: Patch "Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing"" has been added to the 4.4-stable tree Message-ID: <20200415135821.GA3640449@kroah.com> References: <158694575418840@kroah.com> <20200415131412.GD27762@paasikivi.fi.intel.com> <20200415132742.GA3461248@kroah.com> <20200415134520.GE27762@paasikivi.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200415134520.GE27762@paasikivi.fi.intel.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, Apr 15, 2020 at 04:45:20PM +0300, Sakari Ailus wrote: > On Wed, Apr 15, 2020 at 03:27:42PM +0200, Greg KH wrote: > > On Wed, Apr 15, 2020 at 04:14:12PM +0300, Sakari Ailus wrote: > > > Hi Greg, > > > > > > On Wed, Apr 15, 2020 at 12:15:54PM +0200, gregkh@linuxfoundation.org wrote: > > > > > > > > This is a note to let you know that I've just added the patch titled > > > > > > > > Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing" > > > > > > > > to the 4.4-stable tree which can be found at: > > > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > > > > > The filename of the patch is: > > > > revert-videobuf2-v4l2-verify-planes-array-in-buffer-dequeueing.patch > > > > and it can be found in the queue-4.4 subdirectory. > > > > > > > > If you, or anyone else, feels it should not be added to the stable tree, > > > > please let know about it. > > > > > > > > > > > > From 93f0750dcdaed083d6209b01e952e98ca730db66 Mon Sep 17 00:00:00 2001 > > > > From: Mauro Carvalho Chehab > > > > Date: Wed, 11 May 2016 13:09:34 -0300 > > > > Subject: Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing" > > > > > > > > From: Mauro Carvalho Chehab > > > > > > > > commit 93f0750dcdaed083d6209b01e952e98ca730db66 upstream. > > > > > > This patch has been already applied to the 4.4-stable tree --- and the > > > original has been re-applied as well, just as in upstream. > > > > > > The original revert was done because another patch was missing the tree > > > (commit 93f0750dcdaed083d6209b01e952e98ca730db66 upstream), not because > > > there was a problem with the patch itself. > > > > > > In other words, this patch must be dropped. > > > > Really? > > > > This is a mess. I see the following commits in the stable 4.4 tree: > > > > In the 4.4.9 release the following upstream commit was backported: > > 2c1f6951a8a8 ("[media] videobuf2-v4l2: Verify planes array in buffer dequeueing") > > > > then in 4.4.11 it was reverted by backporting: > > 93f0750dcdae ("Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing"") > > > > Then finally, in 4.4.19 this commit gets added: > > 83934b75c368 ("[media] videobuf2-v4l2: Verify planes array in buffer dequeueing") > > > > So, is 83934b75c368 ok to backport, but 2c1f6951a8a8 was not? > > Both are backports of separate patches in upstream, and should be in the > stable trees as they are at the moment (I checked 4.4). This all happened > back in 2016 but now this revert popped up four years later. > > > > > Because they look identical to me... > > They are the same patch that got applied twice with a revert in between. > > > > > So, what am I missing here? > > The fix was originally reverted due to an issue in the API usage in DVB, > and then re-applied with another fix in videobuf2 core. The discussion is > here, and all these patches ended up being applied: > > > > > > Applying this revert re-introduces the original kernel memory overwriting > bug. Ok, thanks, I'll drop this one. Guenter, you should update your list so you don't try to add it again :) thanks, greg k-h