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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A340C47DD9 for ; Mon, 22 Jan 2024 13:48:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 960C66B009B; Mon, 22 Jan 2024 08:48:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9100E6B009C; Mon, 22 Jan 2024 08:48:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FED76B009D; Mon, 22 Jan 2024 08:48:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6E3956B009B for ; Mon, 22 Jan 2024 08:48:33 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3109A160978 for ; Mon, 22 Jan 2024 13:48:33 +0000 (UTC) X-FDA: 81707076906.15.13B41A3 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by imf16.hostedemail.com (Postfix) with ESMTP id 132A5180006 for ; Mon, 22 Jan 2024 13:48:28 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf16.hostedemail.com: domain of jefflexu@linux.alibaba.com designates 115.124.30.131 as permitted sender) smtp.mailfrom=jefflexu@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705931311; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nwWhG1zpkk/pjkhgUySptU2QHZiDDTXCWEb+UFNGa5w=; b=yP24g4siINqjpiIf1ItG+C1HD743fhHQAy1pz2WAI92AW/rMPCwjVzfapkPL1/Ic2D4Ar1 JY3soMffUFrCyDIEWDr1TAxDOOLh3v0jvWL7Rt5qvZPWh1GJRIbktdRFqS8ckJD9nJuSqk 64GIJMlfI03a+B6Og30vgjL7mIOYkeU= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf16.hostedemail.com: domain of jefflexu@linux.alibaba.com designates 115.124.30.131 as permitted sender) smtp.mailfrom=jefflexu@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705931311; a=rsa-sha256; cv=none; b=sHH9xdRxFhNHnFthguW5g/mcrTOplr72mYB7YOXi/RaLqT3kLfmm8XljSe1KdcbcgzD2h8 aOh6mCll0kjWFiFEdabPPfibSAfvYYWwp4Witw41G+EuUixEJXUctblkLrPvIk/4IcXRdn FsX15lxzMOHvTe0XHATE894LACYXXCQ= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=18;SR=0;TI=SMTPD_---0W.9eXi4_1705931303; Received: from 30.221.145.129(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0W.9eXi4_1705931303) by smtp.aliyun-inc.com; Mon, 22 Jan 2024 21:48:24 +0800 Message-ID: <7790423f-665e-44cc-b4ae-d3f3d2996af5@linux.alibaba.com> Date: Mon, 22 Jan 2024 21:48:23 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 06/10] cachefiles, erofs: Fix NULL deref in when cachefiles is not doing ondemand-mode Content-Language: en-US To: David Howells , Christian Brauner Cc: Jeff Layton , Matthew Wilcox , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Marc Dionne , Gao Xiang , Chao Yu , Yue Hu References: <20240122123845.3822570-1-dhowells@redhat.com> <20240122123845.3822570-7-dhowells@redhat.com> From: Jingbo Xu In-Reply-To: <20240122123845.3822570-7-dhowells@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 132A5180006 X-Stat-Signature: brgwkycs7cipjgo4b9ebocy9f8re1ebb X-Rspam-User: X-HE-Tag: 1705931308-194344 X-HE-Meta: U2FsdGVkX1+WF81TwFNi3Lr8fK1PmIVdoSj8MFpw9z4G3hBWyX8gs1cAgD0Y80tatFu4mFod+kIROjZ05gnix4MDBBNXQFr2z+BNxGAqZJFARwegd9a8Lwd4Gtnd2478pbmagtvSzSf+ArK0eMJA9Rnj0ZxU4qYJ84aQp8XyT4MxKgGXcqMJbVL3ypHsFqOyH/KtnH8jTe0R5xNZXQz+7Vl2Ya6yD2OtlUE9YQn2XIu97lEvvgYNo7UVs9xTluXwXYqOreeShbcGvsANGWc07Zu316M1f3dmG132aM7VXP+ohiQjdSq/jgoMVtd5PRO5eJs/PVQt/nF3ZHi+dUw9rBhU+QslTUQmIANa28oYzRpyRcr9Zgnh+gd4ywml/L4kXPmM5MYmJNee8TjJUUVIA4y9V66krwn3s6BZKy0CBunZm+Zu7NKx013NXbRkRysal+YYDmXF/xwtFrPus5Cl0+YQ6YC3AX6Mqi+3mckShphqgNmDma9Amd368EUgI0NaiebSbLdv5wjABQgUKUWJvfSs50wVcpOBdeynmQOwSPSflbq/JDpd3hAm91UMjQm8lI2qBH2eK/J3PoVIGcpF9Ij2U1tBJRv9YKOGtChCQQdkBUBRfhjWNnLh2SWHkQiybgwLhfshdFgdz96qi2yYh76n58iJPNOnvk6UJgy2HnmTeZyP26RmOUfiFGZYNPLkQbP/eSysgjXeTfvTdzsR5DUb2N0DRF2n3UnSH42aX3IyXruCeVI98Q8kwISmkdoq2Fd87GCzHmOBGKhMduR2SeR0h8MZJEZNLTvGJrQ97TwoKgR1myNhbT/kHY9DvrwqV0YSR6hC28UwRCz9d/cIRtgMSgzHJEXpT+nSQOrQ/DlyIUC3tUXBSk4bGFcadh/LyNlKvE3Ejh6Fr59dF20V9WSvlyuN2jHx9gxXv7srEO2zztnJVy7B2RBxHIcIjzszWmw++sn+8WdLTbZsRGw kLtC7IfJ rJ+bN+XGzjC78bFhnZZ+QI6J8S0vQsUJ3xQN4Z4JWKmuf4kqo5l1ATK4hZ8URWXijsB/d6puZF5j2JH030ZSiztgMSNLimnq4jKAqkqYIUcsYNv0+UAF+PePOhsAo2QvTxbr6XP+AtiOYe688Q7h/cFZ/yYn6l83wcd+vimF4mjie2AK/TNXX8mM3F9vvWOKwu7Rh4PbNa8LtFGYJiHYYEuZUJ1j2urJ0qiFP7wL6kGOW8pBKPiVC6vdAadNqLlD0Xk9Y6icN8NqGLX1gHRCpgFNM+J5HSEHmfH3BW8cLrkH+em6IZBgIu1HGp8M6xJV1hmUBasJ2SjYKRcFVQxqaqyPH5EajXA/VO76yF7SLSIuT4m+jAi65hB64/0wzj65oenqPKriTCPW5lW/hS64lfa30M7linzkONjqvFbDgrSERMLj/hroKEJP2z8gp1XlSvyEqdjzC7uaJ12krOvUDcBkzLA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 1/22/24 8:38 PM, David Howells wrote: > cachefiles_ondemand_init_object() as called from cachefiles_open_file() and > cachefiles_create_tmpfile() does not check if object->ondemand is set > before dereferencing it, leading to an oops something like: > > RIP: 0010:cachefiles_ondemand_init_object+0x9/0x41 > ... > Call Trace: > > cachefiles_open_file+0xc9/0x187 > cachefiles_lookup_cookie+0x122/0x2be > fscache_cookie_state_machine+0xbe/0x32b > fscache_cookie_worker+0x1f/0x2d > process_one_work+0x136/0x208 > process_scheduled_works+0x3a/0x41 > worker_thread+0x1a2/0x1f6 > kthread+0xca/0xd2 > ret_from_fork+0x21/0x33 > > Fix this by making the calls to cachefiles_ondemand_init_object() > conditional. > > Fixes: 3c5ecfe16e76 ("cachefiles: extract ondemand info field from cachefiles_object") > Reported-by: Marc Dionne > Signed-off-by: David Howells > cc: Gao Xiang > cc: Chao Yu > cc: Yue Hu > cc: Jeffle Xu > cc: linux-erofs@lists.ozlabs.org > cc: netfs@lists.linux.dev > cc: linux-fsdevel@vger.kernel.org > --- > fs/cachefiles/namei.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c > index 7ade836beb58..180594d24c44 100644 > --- a/fs/cachefiles/namei.c > +++ b/fs/cachefiles/namei.c > @@ -473,9 +473,11 @@ struct file *cachefiles_create_tmpfile(struct cachefiles_object *object) > if (!cachefiles_mark_inode_in_use(object, file_inode(file))) > WARN_ON(1); > > - ret = cachefiles_ondemand_init_object(object); > - if (ret < 0) > - goto err_unuse; > + if (object->ondemand) { > + ret = cachefiles_ondemand_init_object(object); > + if (ret < 0) > + goto err_unuse; > + } I'm not sure if object->ondemand shall be checked by the caller or inside cachefiles_ondemand_init_object(), as cachefiles_ondemand_clean_object() is also called without checking object->ondemand. cachefiles_ondemand_clean_object() won't trigger the NULL oops as the called cachefiles_ondemand_send_req() will actually checks that. Anyway this patch looks good to me. Thanks. Reviewed-by: Jingbo Xu > > ni_size = object->cookie->object_size; > ni_size = round_up(ni_size, CACHEFILES_DIO_BLOCK_SIZE); > @@ -579,9 +581,11 @@ static bool cachefiles_open_file(struct cachefiles_object *object, > } > _debug("file -> %pd positive", dentry); > > - ret = cachefiles_ondemand_init_object(object); > - if (ret < 0) > - goto error_fput; > + if (object->ondemand) { > + ret = cachefiles_ondemand_init_object(object); > + if (ret < 0) > + goto error_fput; > + } > > ret = cachefiles_check_auxdata(object, file); > if (ret < 0) -- Thanks, Jingbo