Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Khalid Aziz <khalid.aziz@oracle.com>
To:     akpm@linux-foundation.org, willy@infradead.org
Cc:     Khalid Aziz <khalid.aziz@oracle.com>, aneesh.kumar@linux.ibm.com,
        arnd@arndb.de, 21cnbao@gmail.com, corbet@lwn.net,
        dave.hansen@linux.intel.com, david@redhat.com,
        ebiederm@xmission.com, hagen@jauu.net, jack@suse.cz,
        keescook@chromium.org, kirill@shutemov.name, kucharsk@gmail.com,
        linkinjeon@kernel.org, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        longpeng2@huawei.com, luto@kernel.org, markhemm@googlemail.com,
        pcc@google.com, rppt@kernel.org, sieberf@amazon.com,
        sjpark@amazon.de, surenb@google.com, tst@schoebel-theuer.de,
        yzaikin@google.com
Subject: [PATCH v1 05/14] mm/mshare: Add locking to msharefs syscalls
Date:   Mon, 11 Apr 2022 10:05:49 -0600
Message-Id: <b9f2a2c2ee33565b158a4bbe97cc2c2861881f93.1649370874.git.khalid.aziz@oracle.com>
In-Reply-To: <cover.1649370874.git.khalid.aziz@oracle.com>
References: <cover.1649370874.git.khalid.aziz@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BpEDGFtrCXmv4T5emsjofaFse7T0t0B/JkYtPsRJO8iWCdorxrAQGmdFnNH0?=
 =?us-ascii?Q?J+U+SQ9/2nP/8l9TJW4Oyay/u3mcRmsLBTJDZtX+m6euOpgIPj1uWUOZAtZz?=
 =?us-ascii?Q?IKzrgBthJ1u4FwcPRVAQEkBpR72iuqC1RISN7ylXNc2/xMv9oF//TLd0SV3c?=
 =?us-ascii?Q?zsvR9wrx1WcLQQ7FLxW+Eix0iTJm6K3Hh69vs1tFEF7RznMu7HQuhG9m8jWb?=
 =?us-ascii?Q?JGSms8aKpprIWx6M2wQlO5Rxiu5GmtMsE3FgTtYqgtxlgch0qHwws7/jPWq4?=
 =?us-ascii?Q?ha1+nR/xhWR6UwmfDO+8dHh9x43Gb6lCQT+Km2Rp2k4ogEL6IU+flapwx6y1?=
 =?us-ascii?Q?9QNRdsVO9OVgQKcMyVjC9ZDmX3bMYGaoIDFxBpWmm4jBAe6u5v/sDWJvhsOh?=
 =?us-ascii?Q?f7EyciqlA3YEfEUhcDUfsBhZ8+gSZBBr+ZsPLfvkRGwNf3luOgWYmVwwjTo6?=
 =?us-ascii?Q?0bY3ja/WIm3S2OfsL6WBqUwkhE25VBxGI6YRK53R0xNIQPKvaJCY8HRVSBWg?=
 =?us-ascii?Q?swivBYqiWX4nA2bhdk0v22vj9REXut6lNo0cblhoj5J/P9CXhryqL/RVMMtm?=
 =?us-ascii?Q?2NzIVdtClbm7vXRLBaFxozjSxQI5sf0he11asIr0NL7mFeFuSaGGaGfPXH01?=
 =?us-ascii?Q?3GvEvH71Z4q1X3yJk3gzslho+lYYSYtlCLuFsRmnGxmDT+esTygt54Jfj+tD?=
 =?us-ascii?Q?nR93Yvle9MLdG0SDNPAiF65lcnwTbyiI+bJ3O/a5GlLFgIUEz6dFAZ17JlCD?=
 =?us-ascii?Q?RygomfLEd48Hf870qjeXl+cnIAH5c3AR70CxOCpg5xGlE1ULZT0Sl6FY6cD7?=
 =?us-ascii?Q?MrhEYNyFj3j38kxFl3hLiU52muzurRWSwOFX9gJD3aA7dqpowphZY6BjnqJz?=
 =?us-ascii?Q?ZU6H9b9CZGvRC46vUaU+FJufTMRbWO8KHD42A5EB1kETB42GCYEEa4wu+atv?=
 =?us-ascii?Q?3ckje9hP8VlSNk4R3Sq73Nrx/2PWhiZYmo99LsgGfBIPFXsaYobwH2PJPI2d?=
 =?us-ascii?Q?cK/CJM7kjRfVsFDfm32K9OKmBO9RHGlh34eiWFGxAZZSEqk5G986kf7iUhZJ?=
 =?us-ascii?Q?AvtqdhL0cu8Ygc7fqJO+H1Ank6465hjh8hnVbirCd93iM8wKTf5CzGKh8lOa?=
 =?us-ascii?Q?27VDEmB+e3K3cYLrUU+HEt4US2NTTx6HNbT8ViI6+2dgR8RXmB9CXlJTe2N/?=
 =?us-ascii?Q?TLWovpozPfJRMTG2ZCi8zp+H8FN+3ySRgMUUDyNXAi0EK7PHc3Mopw+3QwnV?=
 =?us-ascii?Q?qdxf/03f9LXyVMo0WgtuNNGGWTLCCraZWuOqMnPaJFzHaL6gweaKcj6cW2Y2?=
 =?us-ascii?Q?eYaAIRNWjcFQmS13P3G2ERFdM3wrARTNw+TFZgXZS3e4gj3SDgQRNPulVj/N?=
 =?us-ascii?Q?kMlAL65xqoJzgGmS6PgLzW+d+I51nFRr6/efAcoOAAThvyxgHTZuqBPWWLUG?=
 =?us-ascii?Q?zLOuw/UH8+6um9DZVy+ur9mjfM2WMI7aI2b7+9mK/QXEemIi41WNTMWC35Qg?=
 =?us-ascii?Q?kVOp3PPOniSKNLd2TQEE0NJVGCUM7jzRMuvX9oTQJb1J3CfPHZqLjN3l6WHT?=
 =?us-ascii?Q?BkIJ1xa32VaZ3fGDMl4PE2NV0aDtTKcWCtTmYpWgfmYJyhuwvW5WIzUoOfwf?=
 =?us-ascii?Q?vRUrEc/GZ3EQoDcEYpf/L+xFXif2lNIzGLfqPYLBg4SsqLk4kOmANy+Cieq2?=
 =?us-ascii?Q?e7xfwRFGjlXBKT0CZdurl/yj4BPZAHbmTP5zsXE9G5e7Ya8TAZ99/IWUdc3G?=
 =?us-ascii?Q?ysKQvXanMg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 19bb8fc6-a534-4f73-e717-08da1bd54f57
X-MS-Exchange-CrossTenant-AuthSource: BN8PR10MB3220.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 16:07:00.3084
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 3DDcCK4YF193afqhl+aeTxwEt5qYnsQvMssqqfH/vY6uPaCsQ8tWa4Ta9w9zjYD5OK+DVyk969neK1qkLGFtqg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4564
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.858
 definitions=2022-04-11_06:2022-04-11,2022-04-11 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=821
 spamscore=0 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2204110089
X-Proofpoint-GUID: fxrT3nSFlHwtEcbmHonYjqmv2ZCA7UUZ
X-Proofpoint-ORIG-GUID: fxrT3nSFlHwtEcbmHonYjqmv2ZCA7UUZ
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Lock the root inode for msharefs when creating a new file or
deleting an existing one to avoid races. mshare syscalls are low
frequency operations, so locking the root inode is reasonable.

Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
---
 mm/mshare.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mm/mshare.c b/mm/mshare.c
index b9d7836f9bd1..85ccb7f02f33 100644
--- a/mm/mshare.c
+++ b/mm/mshare.c
@@ -195,11 +195,12 @@ SYSCALL_DEFINE5(mshare, const char __user *, name, unsigned long, addr,
 	err = msharefs_d_hash(msharefs_sb->s_root, &namestr);
 	if (err)
 		goto err_out;
+	inode_lock(d_inode(msharefs_sb->s_root));
 	dentry = d_lookup(msharefs_sb->s_root, &namestr);
 	if (dentry && (oflag & (O_EXCL|O_CREAT))) {
 		err = -EEXIST;
 		dput(dentry);
-		goto err_out;
+		goto err_unlock_inode;
 	}
 
 	if (dentry) {
@@ -232,6 +233,7 @@ SYSCALL_DEFINE5(mshare, const char __user *, name, unsigned long, addr,
 			goto err_relinfo;
 	}
 
+	inode_unlock(d_inode(msharefs_sb->s_root));
 	putname(fname);
 	return 0;
 
@@ -239,6 +241,8 @@ SYSCALL_DEFINE5(mshare, const char __user *, name, unsigned long, addr,
 	kfree(info);
 err_relmm:
 	mmput(mm);
+err_unlock_inode:
+	inode_unlock(d_inode(msharefs_sb->s_root));
 err_out:
 	putname(fname);
 	return err;
@@ -264,10 +268,11 @@ SYSCALL_DEFINE1(mshare_unlink, const char *, name)
 	err = msharefs_d_hash(msharefs_sb->s_root, &namestr);
 	if (err)
 		goto err_out;
+	inode_lock(d_inode(msharefs_sb->s_root));
 	dentry = d_lookup(msharefs_sb->s_root, &namestr);
 	if (dentry == NULL) {
 		err = -EINVAL;
-		goto err_out;
+		goto err_unlock_inode;
 	}
 
 	inode = d_inode(dentry);
@@ -290,11 +295,14 @@ SYSCALL_DEFINE1(mshare_unlink, const char *, name)
 		dput(dentry);
 	}
 
+	inode_unlock(d_inode(msharefs_sb->s_root));
 	putname(fname);
 	return 0;
 
 err_dput:
 	dput(dentry);
+err_unlock_inode:
+	inode_unlock(d_inode(msharefs_sb->s_root));
 err_out:
 	putname(fname);
 	return err;
-- 
2.32.0