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 61361C433EF for ; Wed, 27 Oct 2021 14:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3B77A6109D for ; Wed, 27 Oct 2021 14:00:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237311AbhJ0OCt (ORCPT ); Wed, 27 Oct 2021 10:02:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231838AbhJ0OCt (ORCPT ); Wed, 27 Oct 2021 10:02:49 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9AD1C061745 for ; Wed, 27 Oct 2021 07:00:23 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id k7so4293700wrd.13 for ; Wed, 27 Oct 2021 07:00:23 -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=VsY/FViuPLJJ0x97MC/uW0G6j8qKMPcqH4JsVsaJd28=; b=pq7P7YMYIQH9NwuUkgLPVJUTai+lIGPlC5FaJMuPwNa2PuYaeQVV6XanW9YKTIm0HM Q6lPrfldyu0HckCShW0yFEe6FisHQVrfyDrHElq2Ty2l7PMyMtDoLZM6YDp3E8aymfei PVlgZk1Xlcx49k9Z/3qLhdC4r+bZGkySjjkUwXErZcezO8B0XVWGU/yA5rtpjE288Wso +AO1Z78th+sxJ/q6dIJJIGYj61Pqtn9sSmgcS6DC9qzwUwyCnc2o0evzSis2MhsbA8qN tzBG5/cv+N2re3xehzhcVd0iE/UJMGsSfyzqcyx+FBaNuv8qs57/I172ywbxO8ivoYaK zIXw== 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=VsY/FViuPLJJ0x97MC/uW0G6j8qKMPcqH4JsVsaJd28=; b=BoUBUKKKESaJiW0PcwftpC8g84fz5DN9Jk/+YQCFb96p4p5mjMEiGlMvCdMBu9o3R+ xx6ZZD+/yjBC5dbB17uV+YVRzL/mcG01QIB6cO0qJfO99qVRjNMxpEQHk8TITEgsLYzl tMumEosiVbcAruAi3CxLaP3DPqjb7iycv2QpST8JKypBTSKSUeKA5fPB6PiEbPEYpqim isufYg06XcilHMooWAEYH1mIpw9E6VYJ2a+oOXJDQ3jwqmOB0+4X45eAuaEZn3vF8ypB MiK/hVqTCccfgeW1qUgXnrGPZsQc+8jJAcM6HuX33qIGU2OT7Au8xW02n83jLp4HU45E lZBQ== X-Gm-Message-State: AOAM5330OioHqjz1BJ8MM4BK26zJMpqPM9xSEnnN6BwAVivAR4GFMQg0 17AMM5Q0UfpcmPlaj+Xg6iKIHA== X-Google-Smtp-Source: ABdhPJwpzln+cmk6xuo+GBK/V8sev59TI12TEYWN4Q4jok1Tu4vItFDTWfN7+4lRAlhHJH1dFTCkrw== X-Received: by 2002:a5d:5262:: with SMTP id l2mr13983077wrc.131.1635343222402; Wed, 27 Oct 2021 07:00:22 -0700 (PDT) Received: from google.com ([95.148.6.207]) by smtp.gmail.com with ESMTPSA id o17sm3750549wmq.11.2021.10.27.07.00.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 07:00:21 -0700 (PDT) Date: Wed, 27 Oct 2021 15:00:20 +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 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 Rather than submitting a bespoke patch. Right? -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog