From nobody Sat May 10 01:36:50 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=codewreck.org ARC-Seal: i=1; a=rsa-sha256; t=1605802045; cv=none; d=zohomail.com; s=zohoarc; b=Wc2NT0p62t5ADMSw5y2AzD9uzZnMlesiLlGKeVStqNmZSTVM664P2N2ku2ggkLPudgI73UC4iiUVUxyrHB184Tnj/7++G48U/LvXBJ1l6JOSzY6jvO1eSKZMSDsvAwBGSikJ/M20jArghmh2SEzufphHd1/Yebl/eQP9u/YUZ9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605802045; h=Cc:Date:From:In-Reply-To:List-Id:Message-ID:References:Subject:To; bh=FgwVOGrQRgSaXC/c3SASSffjnbPG4AmXzCDcQORhByg=; b=gvsct3eAuCUI0qJoOlsC77wlLd3GyLvGa0efpvTQo907iejGv7QLlg0Zo/5MLTCOja4sn07NDB5jHw2RwaFBLTki3WxKb6YRTx3bZEhzIZFRgQnN2KaG01fjGlBQOyFYDUycy/Oc60X8vqk8kcA65HH25uD7P8FLZdDqRBTylpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1605802045817455.23298639035136; Thu, 19 Nov 2020 08:07:25 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728499AbgKSQHU (ORCPT ); Thu, 19 Nov 2020 11:07:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727678AbgKSQHT (ORCPT ); Thu, 19 Nov 2020 11:07:19 -0500 Received: from nautica.notk.org (ipv6.notk.org [IPv6:2001:41d0:1:7a93::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54D78C0613CF for ; Thu, 19 Nov 2020 08:07:19 -0800 (PST) Received: by nautica.notk.org (Postfix, from userid 1001) id 1EAA0C01A; Thu, 19 Nov 2020 17:07:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codewreck.org; s=2; t=1605802038; bh=FgwVOGrQRgSaXC/c3SASSffjnbPG4AmXzCDcQORhByg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0lf2G7K2lKoVaavnFtQbb1FO4UFaw1BEp0YxrN2XOn3AZ5fyAEVIgdytk1JxZEVGm GUtMrTyYebQdVaU6k50motBOb38Fs7eQCE4opHi+UoekJsvpPZLSzTbdkzw0Z/2TeI y2+YDcuWBsibkVM+nTTIuIxFHF0mpSmJYvvdQlATVf3Uva0t2hOp3wYXAPh+L62we5 2DxbyUH6b3S6eWfS3C/053zpmfxTO+6glIBsUZv4X0xc+GxS0oognuVvMynVh6EOlu eZSxiTJzysr9mNkiGKhAP8iz6kFnsYl7N6Q5+jcQr5gVUx0VIEm1Sk5i4PsWOeT9HB bsz4V0Jvp0hmQ== From: Dominique Martinet Cc: Jianyong Wu , lucho@ionkov.net, justin.he@arm.com, ericvh@gmail.com, qemu_oss@crudebyte.com, groug@kaod.org, linux-kernel@vger.kernel.org, v9fs-developer@lists.sourceforge.net, Dominique Martinet Subject: [PATCH 1/2] 9p: apply review requests for fid refcounting Date: Thu, 19 Nov 2020 17:06:51 +0100 Message-Id: <1605802012-31133-2-git-send-email-asmadeus@codewreck.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1605802012-31133-1-git-send-email-asmadeus@codewreck.org> References: <20201103104116.GA19587@nautica> <1605802012-31133-1-git-send-email-asmadeus@codewreck.org> To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix style issues in parent commit ("apply review requests for fid refcounting"), no functional change. Signed-off-by: Dominique Martinet --- fs/9p/fid.c | 10 ++++------ fs/9p/fid.h | 2 +- include/net/9p/client.h | 2 +- net/9p/client.c | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/9p/fid.c b/fs/9p/fid.c index 89643dabcdae..50118ec72a92 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c @@ -28,7 +28,6 @@ =20 static inline void __add_fid(struct dentry *dentry, struct p9_fid *fid) { - atomic_set(&fid->count, 1); hlist_add_head(&fid->dlist, (struct hlist_head *)&dentry->d_fsdata); } =20 @@ -62,7 +61,7 @@ static struct p9_fid *v9fs_fid_find_inode(struct inode *i= node, kuid_t uid) } } if (ret && !IS_ERR(ret)) - atomic_inc(&ret->count); + refcount_inc(&ret->count); spin_unlock(&inode->i_lock); return ret; } @@ -77,7 +76,6 @@ static struct p9_fid *v9fs_fid_find_inode(struct inode *i= node, kuid_t uid) void v9fs_open_fid_add(struct inode *inode, struct p9_fid *fid) { spin_lock(&inode->i_lock); - atomic_set(&fid->count, 1); hlist_add_head(&fid->ilist, (struct hlist_head *)&inode->i_private); spin_unlock(&inode->i_lock); } @@ -110,7 +108,7 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dent= ry, kuid_t uid, int any) hlist_for_each_entry(fid, h, dlist) { if (any || uid_eq(fid->uid, uid)) { ret =3D fid; - atomic_inc(&ret->count); + refcount_inc(&ret->count); break; } } @@ -201,7 +199,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct d= entry *dentry, } /* If we are root ourself just return that */ if (dentry->d_sb->s_root =3D=3D dentry) { - atomic_inc(&fid->count); + refcount_inc(&fid->count); return fid; } /* @@ -250,7 +248,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct d= entry *dentry, fid =3D ERR_PTR(-ENOENT); } else { __add_fid(dentry, fid); - atomic_inc(&fid->count); + refcount_inc(&fid->count); spin_unlock(&dentry->d_lock); } } diff --git a/fs/9p/fid.h b/fs/9p/fid.h index 1fed96546728..f7f33509e169 100644 --- a/fs/9p/fid.h +++ b/fs/9p/fid.h @@ -28,7 +28,7 @@ static inline struct p9_fid *v9fs_fid_clone(struct dentry= *dentry) if (!fid || IS_ERR(fid)) return fid; =20 - nfid =3D p9_client_walk(fid, 0, NULL, 1); + nfid =3D clone_fid(fid); p9_client_clunk(fid); return nfid; } diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 58ed9bd306bd..e1c308d8d288 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h @@ -149,7 +149,7 @@ enum fid_source { struct p9_fid { struct p9_client *clnt; u32 fid; - atomic_t count; + refcount_t count; int mode; struct p9_qid qid; u32 iounit; diff --git a/net/9p/client.c b/net/9p/client.c index a6c8a915e0d8..ba4910138c5b 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -901,7 +901,7 @@ static struct p9_fid *p9_fid_create(struct p9_client *c= lnt) fid->clnt =3D clnt; fid->rdir =3D NULL; fid->fid =3D 0; - atomic_set(&fid->count, 1); + refcount_set(&fid->count, 1); =20 idr_preload(GFP_KERNEL); spin_lock_irq(&clnt->lock); @@ -1466,7 +1466,7 @@ int p9_client_clunk(struct p9_fid *fid) dump_stack(); return 0; } - if (!atomic_dec_and_test(&fid->count)) + if (!refcount_dec_and_test(&fid->count)) return 0; =20 again: --=20 2.28.0 From nobody Sat May 10 01:36:50 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=codewreck.org ARC-Seal: i=1; a=rsa-sha256; t=1605802046; cv=none; d=zohomail.com; s=zohoarc; b=ZAMqyPAga9c+8HfwFbyP6jnkKuNNhBFXsCKyPU2asoFUfR9vm9uzcG389xzWnjGm6mkqGn1PBeBj7XKxyINRwCq6gy5Lrqomw9bsCve0XsCzkoy02WylVUBFDNlSPfny5BuyBYtGeE2FdblS6BwAA4MKjLs8Wv3hlhSRFWvug2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605802046; h=Cc:Date:From:In-Reply-To:List-Id:Message-ID:References:Subject:To; bh=eK6/Q/abk4MPm5E1E9fU+K69kfbIstGf/YUDyuJZEG0=; b=NBzzlE6SRDZzfMmJUI4zqt8Byi2USzKcwIcG+rTPDa/KFU/eziMO5wmh5tOETs+JC4TLsPVoGkfeo88uRuFrg9HGzvkkY/ipv3eMl47G/TQgVnjFMEyI1YvciUppDhho8B70psL+/pfgiqTypU8ccgaU0XaJMS6KmLrE5Z0291I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1605802046199358.80959461688735; Thu, 19 Nov 2020 08:07:26 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728532AbgKSQHY (ORCPT ); Thu, 19 Nov 2020 11:07:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728459AbgKSQHU (ORCPT ); Thu, 19 Nov 2020 11:07:20 -0500 Received: from nautica.notk.org (ipv6.notk.org [IPv6:2001:41d0:1:7a93::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2800DC0613CF for ; Thu, 19 Nov 2020 08:07:20 -0800 (PST) Received: by nautica.notk.org (Postfix, from userid 1001) id E42A7C01B; Thu, 19 Nov 2020 17:07:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codewreck.org; s=2; t=1605802038; bh=eK6/Q/abk4MPm5E1E9fU+K69kfbIstGf/YUDyuJZEG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MqbGoote7pDVzt+aCgVzGUEojP1xi9hk+JdvrMw6yr+451nTk80Nt+DnBs5e+IbC7 r8FIRiCE/TJOPXgv7OSuzIW5GvKyFDFQe18RJpSKPXVLCbRuOXcMlEbAj0SLwUTdfM BS9tsAXx5puT04bx0YSfIBWn7MSwuX5XHZTIdyHPxmYi3d1VWXGjkKasFj9K5t96ge /LmKup1BqrOjKs7iv5XCCy8YLXC3Exly515Y+FpJvUpBpaXxZIlVyVacicOad/e+Xi 7Lja1p76du44tIaL5wvbYX9N1aCaEJO/mDDRFm8mnrw3/hoOeKpD8TgEkAylAX5z5H muS8ALvu6vGUQ== From: Dominique Martinet Cc: Jianyong Wu , lucho@ionkov.net, justin.he@arm.com, ericvh@gmail.com, qemu_oss@crudebyte.com, groug@kaod.org, linux-kernel@vger.kernel.org, v9fs-developer@lists.sourceforge.net, Dominique Martinet Subject: [PATCH 2/2] 9p: Fix writeback fid incorrectly being attached to dentry Date: Thu, 19 Nov 2020 17:06:52 +0100 Message-Id: <1605802012-31133-3-git-send-email-asmadeus@codewreck.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1605802012-31133-1-git-send-email-asmadeus@codewreck.org> References: <20201103104116.GA19587@nautica> <1605802012-31133-1-git-send-email-asmadeus@codewreck.org> To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" v9fs_dir_release needs fid->ilist to have been initialized for filp's fid, not the inode's writeback fid's. With refcounting this can be improved on later but this appears to fix null deref issues. Fixes: xxx ("fs/9p: track open fids") Signed-off-by: Dominique Martinet --- (note: fixes tag can't be filled here, will be corrected later) fs/9p/vfs_file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index b0ef225cecd0..c5e49c88688d 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -46,7 +46,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) int err; struct v9fs_inode *v9inode; struct v9fs_session_info *v9ses; - struct p9_fid *fid; + struct p9_fid *fid, *writeback_fid; int omode; =20 p9_debug(P9_DEBUG_VFS, "inode: %p file: %p\n", inode, file); @@ -85,13 +85,13 @@ int v9fs_file_open(struct inode *inode, struct file *fi= le) * because we want write after unlink usecase * to work. */ - fid =3D v9fs_writeback_fid(file_dentry(file)); + writeback_fid =3D v9fs_writeback_fid(file_dentry(file)); if (IS_ERR(fid)) { err =3D PTR_ERR(fid); mutex_unlock(&v9inode->v_mutex); goto out_error; } - v9inode->writeback_fid =3D (void *) fid; + v9inode->writeback_fid =3D (void *) writeback_fid; } mutex_unlock(&v9inode->v_mutex); if (v9ses->cache =3D=3D CACHE_LOOSE || v9ses->cache =3D=3D CACHE_FSCACHE) --=20 2.28.0