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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6190AC433FE for ; Wed, 27 Oct 2021 14:42:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 486EF60F0F for ; Wed, 27 Oct 2021 14:42:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237899AbhJ0Oog (ORCPT ); Wed, 27 Oct 2021 10:44:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbhJ0Ooe (ORCPT ); Wed, 27 Oct 2021 10:44:34 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 556F9C061745 for ; Wed, 27 Oct 2021 07:42:09 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id z14so4585692wrg.6 for ; Wed, 27 Oct 2021 07:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=VJ5q2bIPzwBUEYk6Imk/385wk0jHO1MD7bOFpHNONIc=; b=VDzUHaMvd+r7etLtk3KoShKIAARjA4qa+Pz7H6GY+F5rpVTNxCFa/D/uHAmLA8Tfw2 85VqWERD4i3brDUf/d58kCFtg18duJSTl9+3iOhUoHokCbC+3uKzRiXEZqmV9czkCEJL WL2o3JVcddjSRdphCh8vOZz+v/5C1TBXbJIQ+k88bkbFRvocJbQoB+eNclO+7h7IhSPk Sd9bWhI8dmdS9GeS6ZCYBJiDSGD0RziQv8ghodhmLkq0PcP5tKi1ehiluX2NbeUEuXjB m7rnkOOQlqibjlvZQRVg5GZ4Ngfn2HeoHZJuo69zdQPEiYCeHEz1PDkLXJ+1Ao73EAD/ x8fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=VJ5q2bIPzwBUEYk6Imk/385wk0jHO1MD7bOFpHNONIc=; b=HzjgdrJFZZC/tppVRL/EDC6epspYm9tN7Y1W84QOzbRW6V8tVc2MZzkCB8X0qBJdf9 3jO4BbwvXQBHOB201+01pFWWmuOmy92CgLevkFo9X0mC6il9o53QXhP7Pp8SArl6koL2 Me0Miy79KyUBuqgg7vNbQJPx45MmzVsmSv0p6WORQtaeN3NTF7GDi7nM2HL4U7gp/jl/ x7vORKPn+8hB8Fg16I0jEw8k/JgsBrnpIvUqLCJBR2h16bw47xhF2X3R41hMLIDWHk+/ PIxjZF8B6NMlwStTsHLDCx78p4MsaBjLanJ+4xW+UCn/AXsF6vpcfasAPIDpWRsftgi6 8dKg== X-Gm-Message-State: AOAM533SH+ioYHMdtasVm7EvytHCk8uwqOxNhkfyQqa94teQgRF1W9qA Z1MjE9URokPx9fQ1Q11g3IxA3g== X-Google-Smtp-Source: ABdhPJyyXpkedUauKUpN88idrfkMP7XxzvEs2cNPQz+Wf4koEQeiMHbMWGSj2FWwB6VnZ7szARhGvA== X-Received: by 2002:a5d:47ca:: with SMTP id o10mr40521590wrc.360.1635345727832; Wed, 27 Oct 2021 07:42:07 -0700 (PDT) Received: from google.com ([95.148.6.207]) by smtp.gmail.com with ESMTPSA id t1sm92487wre.32.2021.10.27.07.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 07:42:07 -0700 (PDT) Date: Wed, 27 Oct 2021 15:42:05 +0100 From: Lee Jones To: Greg KH Cc: stable@vger.kernel.org, axboe@kernel.dk, asml.silence@gmail.com, io-uring@vger.kernel.org, syzbot+59d8a1f4e60c20c066cf@syzkaller.appspotmail.com Subject: Re: [PATCH 5.10 1/1] io_uring: fix double free in the deferred/cancelled path Message-ID: References: <20211027080128.1836624-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On Wed, 27 Oct 2021, Greg KH wrote: > On Wed, Oct 27, 2021 at 03:00:20PM +0100, Lee Jones wrote: > > On Wed, 27 Oct 2021, Greg KH wrote: > > > > > On Wed, Oct 27, 2021 at 10:03:01AM +0100, Lee Jones wrote: > > > > On Wed, 27 Oct 2021, Greg KH wrote: > > > > > > > > > On Wed, Oct 27, 2021 at 09:37:59AM +0100, Lee Jones wrote: > > > > > > On Wed, 27 Oct 2021, Greg KH wrote: > > > > > > > > > > > > > On Wed, Oct 27, 2021 at 09:01:28AM +0100, Lee Jones wrote: > > > > > > > > 792bb6eb86233 ("io_uring: don't take uring_lock during iowq cancel") > > > > > > > > inadvertently fixed this issue in v5.12. This patch cherry-picks the > > > > > > > > hunk of commit which does so. > > > > > > > > > > > > > > Why can't we take all of that commit? Why only part of it? > > > > > > > > > > > > I don't know. > > > > > > > > > > > > Why didn't the Stable team take it further than v5.11.y? > > > > > > > > > > Look in the archives? Did it not apply cleanly? > > > > > > > > > > /me goes off and looks... > > > > > > > > > > Looks like I asked for a backport, but no one did it, I only received a > > > > > 5.11 version: > > > > > https://lore.kernel.org/r/1839646480a26a2461eccc38a75e98998d2d6e11.1615375332.git.asml.silence@gmail.com > > > > > > > > > > so a 5.10 version would be nice, as I said it failed as-is: > > > > > https://lore.kernel.org/all/161460075611654@kroah.com/ > > > > > > > > Precisely. This is the answer to your question: > > > > > > > > > > > Why can't we take all of that commit? Why only part of it? > > > > > > > > Same reason the Stable team didn't back-port it - it doesn't apply. > > > > > > > > The second hunk is only relevant to v5.11+. > > > > > > Great, then use the "normal" stable style, but down in the s-o-b area > > > say "dropped second chunk as it is not relevant to 5.10.y". > > > > Just to clarify, by "normal", you mean: > > > > - Take the original patch > > - Apply an "[ Upstream commit ]" tag (or similar) > > - Remove the hunk that doesn't apply > > - Make a note of the aforementioned action > > - Submit to Stable > > Yes. > > > Rather than submitting a bespoke patch. Right? > > Correct. Got it, thanks. Wilco. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog