From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F38515884E; Tue, 23 Jul 2024 17:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721757289; cv=none; b=MqL7ehsgl1xZEWyfT101ucnEpKSZmANNpAwnwbk7vxBG8cI+0EcE0YQgT/Gkf1sTIBpPclZH4pQBsAECJhUAczmKgGrLjukQBUICUN8GtcpAhbbKqK5jeessxcdpTYIl7exvp6shxo7nyzGEDu2TrFj9jZnYZ8S2IhsUA5VvqOk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721757289; c=relaxed/simple; bh=VJQ5TPZkxyGqe3b12F5FdRJRCMUvKoAs74UEBOtOoZY=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=t9xIWRja8/nKhwa0+zkVCALR2larEmp78q1YOSsbVbYZQXYAjY0QwrPqeLg1NNuwGzn3OkLk8D/ufjsVbgjQiO071usb7MXHg40Sohu2TXjtJl6f+DpZOQZL2lM6nk1b6z8RpLdcPvKuY0QVqhfzpqQhGWOzbdeP4PsELzHqfoA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jI2rNBMI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jI2rNBMI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B712DC4AF09; Tue, 23 Jul 2024 17:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721757289; bh=VJQ5TPZkxyGqe3b12F5FdRJRCMUvKoAs74UEBOtOoZY=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=jI2rNBMIf63437YhZPpFWV+4dHY90dFBcfLbY4hLWV8GbODOR1pjAuHAZEUte0IOl o6pKzSHAvoI4lvYnrs3pEmMBmOz/4ZP8QbamFcPmPx5r16+35Q4YYse0ULtC+TYSRd j+4V08gXY8I2DroYyeuBbTAK7y1kx6UHc3YqUB14= Subject: Patch "netfs, fscache: export fscache_put_volume() and add fscache_try_get_volume()" has been added to the 6.6-stable tree To: brauner@kernel.org,gregkh@linuxfoundation.org,hsiangkao@linux.alibaba.com,libaokun1@huawei.com,libaokun@huaweicloud.com,patches@lists.linux.dev,sashal@kernel.org,yangerkun@huawei.com Cc: From: Date: Tue, 23 Jul 2024 19:54:35 +0200 In-Reply-To: <20240719134004.1584648-1-libaokun@huaweicloud.com> Message-ID: <2024072335-velocity-numbing-7ea8@gregkh> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore This is a note to let you know that I've just added the patch titled netfs, fscache: export fscache_put_volume() and add fscache_try_get_volume() to the 6.6-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: netfs-fscache-export-fscache_put_volume-and-add-fscache_try_get_volume.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-60611-greg=kroah.com@vger.kernel.org Fri Jul 19 15:43:03 2024 From: libaokun@huaweicloud.com Date: Fri, 19 Jul 2024 21:40:02 +0800 Subject: netfs, fscache: export fscache_put_volume() and add fscache_try_get_volume() To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, sashal@kernel.org, patches@lists.linux.dev, hsiangkao@linux.alibaba.com, yangerkun@huawei.com, libaokun1@huawei.com, Christian Brauner Message-ID: <20240719134004.1584648-1-libaokun@huaweicloud.com> From: Baokun Li [ Upstream commit 85b08b31a22b481ec6528130daf94eee4452e23f ] Export fscache_put_volume() and add fscache_try_get_volume() helper function to allow cachefiles to get/put fscache_volume via linux/fscache-cache.h. Signed-off-by: Baokun Li Link: https://lore.kernel.org/r/20240628062930.2467993-2-libaokun@huaweicloud.com Signed-off-by: Christian Brauner Stable-dep-of: 522018a0de6b ("cachefiles: fix slab-use-after-free in fscache_withdraw_volume()") Stable-dep-of: 5d8f80578907 ("cachefiles: fix slab-use-after-free in cachefiles_withdraw_cookie()") Signed-off-by: Baokun Li Signed-off-by: Greg Kroah-Hartman --- fs/fscache/internal.h | 2 -- fs/fscache/volume.c | 14 ++++++++++++++ include/linux/fscache-cache.h | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) --- a/fs/fscache/internal.h +++ b/fs/fscache/internal.h @@ -145,8 +145,6 @@ extern const struct seq_operations fscac struct fscache_volume *fscache_get_volume(struct fscache_volume *volume, enum fscache_volume_trace where); -void fscache_put_volume(struct fscache_volume *volume, - enum fscache_volume_trace where); bool fscache_begin_volume_access(struct fscache_volume *volume, struct fscache_cookie *cookie, enum fscache_access_trace why); --- a/fs/fscache/volume.c +++ b/fs/fscache/volume.c @@ -27,6 +27,19 @@ struct fscache_volume *fscache_get_volum return volume; } +struct fscache_volume *fscache_try_get_volume(struct fscache_volume *volume, + enum fscache_volume_trace where) +{ + int ref; + + if (!__refcount_inc_not_zero(&volume->ref, &ref)) + return NULL; + + trace_fscache_volume(volume->debug_id, ref + 1, where); + return volume; +} +EXPORT_SYMBOL(fscache_try_get_volume); + static void fscache_see_volume(struct fscache_volume *volume, enum fscache_volume_trace where) { @@ -420,6 +433,7 @@ void fscache_put_volume(struct fscache_v fscache_free_volume(volume); } } +EXPORT_SYMBOL(fscache_put_volume); /* * Relinquish a volume representation cookie. --- a/include/linux/fscache-cache.h +++ b/include/linux/fscache-cache.h @@ -19,6 +19,7 @@ enum fscache_cache_trace; enum fscache_cookie_trace; enum fscache_access_trace; +enum fscache_volume_trace; enum fscache_cache_state { FSCACHE_CACHE_IS_NOT_PRESENT, /* No cache is present for this name */ @@ -97,6 +98,11 @@ extern void fscache_withdraw_cookie(stru extern void fscache_io_error(struct fscache_cache *cache); +extern struct fscache_volume * +fscache_try_get_volume(struct fscache_volume *volume, + enum fscache_volume_trace where); +extern void fscache_put_volume(struct fscache_volume *volume, + enum fscache_volume_trace where); extern void fscache_end_volume_access(struct fscache_volume *volume, struct fscache_cookie *cookie, enum fscache_access_trace why); Patches currently in stable-queue which might be from kroah.com@vger.kernel.org are queue-6.6/netfs-fscache-export-fscache_put_volume-and-add-fscache_try_get_volume.patch queue-6.6/cachefiles-fix-slab-use-after-free-in-cachefiles_withdraw_cookie.patch queue-6.6/cachefiles-fix-slab-use-after-free-in-fscache_withdraw_volume.patch