From patchwork Tue Sep 7 20:50:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Brennan X-Patchwork-Id: 12479311 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC9A2C4332F for ; Tue, 7 Sep 2021 20:50:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 92CD76105A for ; Tue, 7 Sep 2021 20:50:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346825AbhIGUwB (ORCPT ); Tue, 7 Sep 2021 16:52:01 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:35098 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235183AbhIGUv6 (ORCPT ); Tue, 7 Sep 2021 16:51:58 -0400 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 187I9PTF006454; Tue, 7 Sep 2021 20:50:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=mrZPNwyb9BbCdc/OdJI+hLneeob28IHL3mwzE/kTTyU=; b=qHLqBvlrrlIh0ZUi15t2jRKz5hmU/m+uhIpogeOiKZKU0sDbtgJjnsa9kPj67JxfCjA9 oDk9kdoAOBPabeoY4gy1Xr62/YYbTPWhgY250z3TMqNRzPXoU0hTl3TH7iigvqfaKrIu b2L6w8ArERxJBPPpvu62vKjZtfOcSlGRt0JuCdNYnAnShyyZeWD9hVtVV+Q086DMUedv HeoR7tkLqTLRX0ApcEHw69sAHBH9IZ4ET9l9vpWRtnKkQfiuX++uXB45ytZ8ZLIHc0xb czAatODDQwqplRJ6xMt1aCKrBaRdoyya+YZtkFKIcDsgyDXDi5KTly6tIpc7e716tfaz qg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=mrZPNwyb9BbCdc/OdJI+hLneeob28IHL3mwzE/kTTyU=; b=LJAzQ5sRPslU94sH5hMYukz/p2njslxm7Ds8Trqb1ZJxNHNCAszo0jh1mj8yo5NxYcTR qUzko3ze6ukFHBEjtucH8Pl9zsWty4w2eMTUy8ytmxEjlmLmOq5PyNXLxSAXmiUxWYwa 3V4AjF8vogvsXOlCcDajZIKT0dCaNXVStAhLfPZofJNUoJWg4DPtY/L/0Oj228XUMtQz UnKLVsgU7wGg/sZK6W7EUE8a9Hr1wKKYMMMbGOph7xZfH5fiFYmVGcwfDr+1gBmhTzu1 S9ien7pURKSJkKPvDTntXy8mwYJDwFTPRhJ3Lla27aC0gzkIFEEvLkHWSIOV0iQqTESe wg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3axd44rcw3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Sep 2021 20:50:51 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 187KQPNt178950; Tue, 7 Sep 2021 20:50:49 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam08lp2049.outbound.protection.outlook.com [104.47.73.49]) by userp3020.oracle.com with ESMTP id 3axcppg9g1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Sep 2021 20:50:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R5UQq0+GUgZeD2Pd/QwYZ4kv3u5412iKiVfLzn3AQIAazOt89+ploVm4zFtlU5ueJoF8L+hKuHQaPtHtJqBriIgGFINAH1mNZkcRSOkljPbC3DLkL/Sq+Z+czToHL4DYmngQGsYx/zRbM6/vZ0KNDy7+Xh9hMmNWHAnxoeAX29Ub3q6ffAakrgFAJs/4ifXHZ4gA0BgzOmHJWSvsd+BbFTJXp2rr1G5mRMo9+2OidLPz6XV/NBtxqUX7AZD/RHom9+ZtC94UYh53kmbqi6OSMnHL0MqzAKvf3GjbQIN5Muvcyal1dVVApTSH33idLkbNjuMN3PAPRhIjkouo7K2XKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mrZPNwyb9BbCdc/OdJI+hLneeob28IHL3mwzE/kTTyU=; b=eoSo6AYydGnuh1b3+cpFoIDXswZiCQ19tRB+vm75itXNdUUVp6NDHNpcLByAU3hIR5x7d1YcQmDU6Sct1pO1Crj12vhXByxdclkqaF98yX/VV/iuPsN2/vJBakDBwIwE3nvQU++yJ02NlH34plE5g9nRaUDMQMU7gHtfoglq2zli8qPgB8UKM8Wc/BSvvnIhmLGa43g+xiGng14c5M7Up5XsIax5FtCb8W67y/xsyIr9m7hLOWBPXKW7qhqCacfSqViPUKmE+ulAMZyyVK7d9wvxuSc5wUQgIUQvzTL4KX9Kz0w6g0EV8kQxF+pkj95K+dtWR5MHCjACQYPvwwjknw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mrZPNwyb9BbCdc/OdJI+hLneeob28IHL3mwzE/kTTyU=; b=l7cDYYUqoyhu/20y2Ki99e6m7sMCX/2hM+Fa4EM17vOlK7gzVL8d4atVlPOtT0Bg9NCt/H6MkkT8cebvmGeOMh+NROyoUO5qLMklBDxOQftFKiY5B/l+Di2u0Fmo1er5vPk+eP0sb/v3Nco0/En1mCw6F2W/GmVhj563sI8PPBg= Authentication-Results: zeniv.linux.org.uk; dkim=none (message not signed) header.d=none;zeniv.linux.org.uk; dmarc=none action=none header.from=oracle.com; Received: from CH2PR10MB4166.namprd10.prod.outlook.com (2603:10b6:610:78::20) by CH2PR10MB4149.namprd10.prod.outlook.com (2603:10b6:610:a7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 20:50:47 +0000 Received: from CH2PR10MB4166.namprd10.prod.outlook.com ([fe80::2c22:7eb8:a2f0:e027]) by CH2PR10MB4166.namprd10.prod.outlook.com ([fe80::2c22:7eb8:a2f0:e027%9]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 20:50:47 +0000 From: Stephen Brennan To: Alexander Viro , Jens Axboe , Dmitry Kadashev Cc: Stephen Brennan , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] namei: Fix use after free in kern_path_locked Date: Tue, 7 Sep 2021 13:50:41 -0700 Message-Id: <20210907205043.16768-2-stephen.s.brennan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907205043.16768-1-stephen.s.brennan@oracle.com> References: <20210907205043.16768-1-stephen.s.brennan@oracle.com> X-ClientProxiedBy: BYAPR01CA0033.prod.exchangelabs.com (2603:10b6:a02:80::46) To CH2PR10MB4166.namprd10.prod.outlook.com (2603:10b6:610:78::20) MIME-Version: 1.0 Received: from localhost (136.24.196.55) by BYAPR01CA0033.prod.exchangelabs.com (2603:10b6:a02:80::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21 via Frontend Transport; Tue, 7 Sep 2021 20:50:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fcb37d4a-e897-4a5e-1c8c-08d972412b10 X-MS-TrafficTypeDiagnostic: CH2PR10MB4149: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: niDSeREQDxPquc4oLNeG5m/WTYx5d4b+nzH7LiQRf1+6IHZKSicub9jonvVbg3JOj94HCAKhv634X4++dTdGZda8mIt/rk8GlD8obLLrS1f/QVLxabvO0Hnfri1r+3qj3eL/T/f2BON5644BYCgcnYy7blgEQ/oH9yMxbnVy8RzUPj4mt0wzXM9dVVOdolQmIe3Rukmi/uSCENiNqYju8VmCEJcwehVS5Q0ze7ZWs6d7P3KqpG/wf4UElIHH9jg93byTjL+zg+qB8P0bohuOrS4UxY9bmtV2n/q9oD/hSa1Sh/5iG2mJdVh2KKSPXnvDyQ9Y22H5fh7FVaUffh/WeutOVA4EjPSWN3avwIFMIv/IXIqTkPrwp+upS+fdNqghpsKCjJeGF64t/tnbiRDRjHqIUGxlSMVbL/LwM4V+zwa6fgu4jW+U1Bq9qD3JwbDyr7DDU2LXr6DldmmeYOXZck1fvUrfg8rqkRfSYEG+Zltsin3iSB8E8iFO1ORcfEUeQxSZpAY5xn7syi+AB6BtRki7Eo5B+Oo2Y5CJGVtSd6f5QqXR4tyRqtlXNFeFnkq9H9ksIsiC6NQDLAHTXn9/I+4pEs00FYskDHYXY6Ym1rhAZqFg6UcURLJV5CYnTJ9mvBTYw8NleFYPNiQ1K8WUTMoo18XwZg+09rXDx3x6VwYqBxY8RDxC6OlNIa/QWUOZnX5uh1ehMvFF0HrzQ3Grvv0jPnos+2SLijuBEDzJ2C+sn3mqBYTNllgAZtyiulhbxD7xgmQYA38sI4c0sqRlVaDltMu1z5uCwuIZtVKUpk8/23MBOxFp94PLjT9wURk4/bKRNY0RujP4PWMHsjkjbdVeYqOIwZYaTJBdc7WHK3Y6lpyAdTDp6xgov0zut3dbJA9wUoLafvT+XChlONeLn3jim9uhr9qzTSyMbzqT7R6C2x/7kPYhpJoqkQy+mTgTzTrHLnZhiFbk6YPaT0rLUYi7u3GsumGgpCcLBjPAjplwU+a5JEy462YsKN4jUPTLXXWngcmDbEDqbgkIb8RUX84R1SbCG/E1dl0ybVT6b2bWeF348qE08wdpg2/Jfj/WPazmkS2K66gZrDg/FuRHkGUb6Z7qKz+ywRIlu2+4ilamYprPAWPkkiCISwoR1NFLc74NJEu6MWuUi3lk9CDwrw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:5;SRV:;IPV:NLI;SFV:SPM;H:CH2PR10MB4166.namprd10.prod.outlook.com;PTR:;CAT:OSPM;SFS:(366004)(103116003)(83380400001)(6666004)(26005)(6486002)(86362001)(186003)(956004)(1076003)(8936002)(38100700002)(2616005)(38350700002)(8676002)(36756003)(5660300002)(4326008)(66946007)(66556008)(66476007)(316002)(508600001)(966005)(110136005)(6496006)(2906002)(52116002)(23200700001);DIR:OUT;SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b0QyD8AeF9uuWsiajM0rxW3BBDxabT83LU1IHJatkUONSQJmDAoXY9xmnmATxQAJW56gOUxO+47KWAKdYqTVRy/JqTqLPdk8w8xGAja5B8CGgcHRHfl3nP1gecQ7aI65mEsHWqyFtWZKA3HN/j4hLcv9HAddTK03mZPMWuTtp7zTRFZqzHi3gM0G+zZqUWQcIbIdOWeKTKGLbG/GT1CIN/bziAnkMTW/mrNE7NF3Th7HpfyF0lgOX0lCGXfgYDzLlyKqaovA6fg83LqPDxy0o0pN4gzjgJzHTvRSEn5cQSCgMVlnhrY/RAsa6eiEO63biyVIrTqMQ/te8mEkXQV4bAW48TPFjSo02fjSU2vaExkcZDjOS8XhWkGT2RqehL06TC5xNsDdwKSTJ2bzQQPnP4L5kIszLWnsblmo/EMllRdUDrFxVY1KhM/TgG2Zqn4nNjDSgwRmPuHkvkMSkcHfXdtMtW78zDw6rTxAtEUnfKiyUd2gtmeQUdA+Rw+UODe9BfpiXmRL21x9lrj3jpMeYT6w6zmnTph/dHbCDAkm5JGSpwHEUBBMuxDccaynAxYfB/i3hDK3lfCfHJoGzxqN/W9sogi0S5JDqnb5kppYSHvZDOA69zCX+66rOvCPoINAnhK5zWnJO3car+pb43KKZZ9FOVAJiqDDVCHsEfuOwGQ5mdyXItzovWzZLrju/josTwT0UNAnpuNO2OSWL44f87GN+06b7wFlTvFN8Rt5jI1Kq7w97/woQKlCNa8yGfRTrWqEIjKz7UOWhPR6Qzk3Tdj85mc0RMm55ip2RIzfS8Te5rImKUJo45kAYyTOwm2l3NEcVAajs9nJhTaL5LR487lGrTimzitr0yRmgByGasGJQ4Mg9CEFR+QjznB4XMuYKmVSikf2mvd0aqRUvuv4LpOm9UKVrzAa5+f8J1ALFY6B9uZe6w0qQHdFpImAbXz9FzavMqsEqVsFiM+LgHXGcy+Bibvx9uAZeHeO642M6xGNP5APOCe0ES62Ks4F+ExtbF+vI3vmN2uUvFys2B0dy5yvMK0PY7qtRLXO6rZ1NvXULsqAOiuNsNDfGSlIqbcVcF9P/S60gjseKuYri1Ax5Mx21K4x29waBkmbNQiZzBMzC5VSenQfy6BQioGoHZkYUhuc1AizDJpufYINoUHaBgvTCdOsOXAJLuCKdNT5bGqkiSAYEFrT7Atdxg6pJyUSNhuexSV8zP8mc80a3+/0q6EBAWZezoAs3YJMw8ORzxDC7QC3ePF8h60FOnH9ASdH805sX2q9MT58xJTgBaGS8ccVZwWy5/NXVFk6WhHzK02J2BcJu0lvkwa2ojzEK/vr X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcb37d4a-e897-4a5e-1c8c-08d972412b10 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 20:50:47.1866 (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: wWRTWYQplu4ZmBTOJQ6kNVJJwlur/HZrejFTEr0NMEM0iDqh/PQcA1yaUiToBAn4oZMRwzwMPYEflJUV2GdwiVMfSQEDsBdFaeMmuo8DvyI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4149 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10100 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001 definitions=main-2109070130 X-Proofpoint-GUID: 8T5xfO6vbJTeRdxhLaCDuyW__VlgV5LE X-Proofpoint-ORIG-GUID: 8T5xfO6vbJTeRdxhLaCDuyW__VlgV5LE Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org In 0ee50b47532a ("namei: change filename_parentat() calling conventions"), filename_parentat() was made to always call putname() on the filename before returning, and kern_path_locked() was migrated to this calling convention. However, kern_path_locked() uses the "last" parameter to lookup and potentially create a new dentry. The last parameter contains the last component of the path and points within the filename, which was recently freed at the end of filename_parentat(). Thus, when kern_path_locked() calls __lookup_hash(), it is using the filename after it has already been freed. In this case, filename_parentat() is fundamentally broken due to this use after free. So, remove it, and rename __filename_parentat to filename_parentat, migrating all callers. Adjust kern_path_locked to put the filename once all users are done with it. Fixes: 0ee50b47532a ("namei: change filename_parentat() calling conventions") Link: https://lore.kernel.org/linux-fsdevel/YS9D4AlEsaCxLFV0@infradead.org/ Link: https://lore.kernel.org/linux-fsdevel/YS+csMTV2tTXKg3s@zeniv-ca.linux.org.uk/ Cc: Christoph Hellwig Cc: Al Viro Reported-by: syzbot+fb0d60a179096e8c2731@syzkaller.appspotmail.com Signed-off-by: Stephen Brennan Co-authored-by: Dmitry Kadashev --- fs/namei.c | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index d049d3972695..f2af301cc79f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2514,9 +2514,10 @@ static int path_parentat(struct nameidata *nd, unsigned flags, return err; } -static int __filename_parentat(int dfd, struct filename *name, - unsigned int flags, struct path *parent, - struct qstr *last, int *type) +/* Note: this does not consume "name" */ +static int filename_parentat(int dfd, struct filename *name, + unsigned int flags, struct path *parent, + struct qstr *last, int *type) { int retval; struct nameidata nd; @@ -2538,30 +2539,24 @@ static int __filename_parentat(int dfd, struct filename *name, return retval; } -static int filename_parentat(int dfd, struct filename *name, - unsigned int flags, struct path *parent, - struct qstr *last, int *type) -{ - int retval = __filename_parentat(dfd, name, flags, parent, last, type); - - putname(name); - return retval; -} - /* does lookup, returns the object with parent locked */ struct dentry *kern_path_locked(const char *name, struct path *path) { + struct filename *filename; struct dentry *d; struct qstr last; int type, error; - error = filename_parentat(AT_FDCWD, getname_kernel(name), 0, path, - &last, &type); - if (error) - return ERR_PTR(error); + filename = getname_kernel(name); + error = filename_parentat(AT_FDCWD, filename, 0, path, &last, &type); + if (error) { + d = ERR_PTR(error); + goto out; + } if (unlikely(type != LAST_NORM)) { path_put(path); - return ERR_PTR(-EINVAL); + d = ERR_PTR(-EINVAL); + goto out; } inode_lock_nested(path->dentry->d_inode, I_MUTEX_PARENT); d = __lookup_hash(&last, path->dentry, 0); @@ -2569,6 +2564,8 @@ struct dentry *kern_path_locked(const char *name, struct path *path) inode_unlock(path->dentry->d_inode); path_put(path); } +out: + putname(filename); return d; } @@ -3634,7 +3631,7 @@ static struct dentry *__filename_create(int dfd, struct filename *name, */ lookup_flags &= LOOKUP_REVAL; - error = __filename_parentat(dfd, name, lookup_flags, path, &last, &type); + error = filename_parentat(dfd, name, lookup_flags, path, &last, &type); if (error) return ERR_PTR(error); @@ -3996,7 +3993,7 @@ int do_rmdir(int dfd, struct filename *name) int type; unsigned int lookup_flags = 0; retry: - error = __filename_parentat(dfd, name, lookup_flags, &path, &last, &type); + error = filename_parentat(dfd, name, lookup_flags, &path, &last, &type); if (error) goto exit1; @@ -4135,7 +4132,7 @@ int do_unlinkat(int dfd, struct filename *name) struct inode *delegated_inode = NULL; unsigned int lookup_flags = 0; retry: - error = __filename_parentat(dfd, name, lookup_flags, &path, &last, &type); + error = filename_parentat(dfd, name, lookup_flags, &path, &last, &type); if (error) goto exit1; @@ -4683,13 +4680,13 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd, target_flags = 0; retry: - error = __filename_parentat(olddfd, from, lookup_flags, &old_path, - &old_last, &old_type); + error = filename_parentat(olddfd, from, lookup_flags, &old_path, + &old_last, &old_type); if (error) goto put_names; - error = __filename_parentat(newdfd, to, lookup_flags, &new_path, &new_last, - &new_type); + error = filename_parentat(newdfd, to, lookup_flags, &new_path, &new_last, + &new_type); if (error) goto exit1; From patchwork Tue Sep 7 20:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Brennan X-Patchwork-Id: 12479315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25E02C433EF for ; Tue, 7 Sep 2021 20:51:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A4C360EE6 for ; Tue, 7 Sep 2021 20:51:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346984AbhIGUwL (ORCPT ); Tue, 7 Sep 2021 16:52:11 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:47548 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346937AbhIGUwH (ORCPT ); Tue, 7 Sep 2021 16:52:07 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 187HpX6O002592; Tue, 7 Sep 2021 20:51:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=tvz8+mSx/6hAxHUxDTynb8tn5ymhX7NY1MEMEv78HNI=; b=ChcxgB9t4YcU5MqASR2kpG7YoeJlvOnn8c6kFuK6Sj6c6OKT04C6DcMem/HyeW7H8SoJ V4o+Bh0NYbIltyW/+qY7gQhNU0NTl0q7aVYhDPCnGVxuYU1sooufNmHRO19KLAjH8c76 qRdfzvffrGiRTxU+ZXZmRMYvWJ6sH1Rrr4dqE7awyKr5v25qcgNMyAFBvWR/ESMhcUs5 Jqv3wfRD8RI56l1Cu6664ruBWLOC/r8kSyVt1afn0uqCyYZayq0kGIG3qfwYmRj2qOW6 cTV1deILrPsPWJDr1Yisgrz5ilF55nGvpwWInp5qkaj1Stwo2eJWRb51iOCGRvtB0/Hq 9Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=tvz8+mSx/6hAxHUxDTynb8tn5ymhX7NY1MEMEv78HNI=; b=S5iYy6aoPHsf8dSt0TC1Sx/mwgKrqwe9MeUOPn+fi7CFSQr/kEvT6+XwniR8CU8vwuho eth1oJ18D96YxQLSAH6V5M9tx3E+hZK/FA+0eKXhvSyG+XpoiBYRaLp8VQH4EyFDsVs6 r+PzPw2zVcTKncEK9VJqUL9ATWlrmR834x2h3MlkxuoorzudZaZdT5RNXfO0UAUYbdMt vTVSeXogMdACNwWfTByV6vIrVtXmY+ERb7O4PVGi+AS7R6dlKCzJXEFlKcMpDgGHB1Ay VlApYVQtg9rFBAu2CacWetsWZPfXoYxcFnk+69+i8P97fibXZTiNJnpLj00BiWDEEpez oQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3axcuq8eg4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Sep 2021 20:50:59 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 187KQFRF185832; Tue, 7 Sep 2021 20:50:51 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam08lp2044.outbound.protection.outlook.com [104.47.73.44]) by aserp3020.oracle.com with ESMTP id 3axcpk7tjg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Sep 2021 20:50:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HsV+VQxRIJqN0oQDKedp7k4Ic0imlbB878c7iFau9juV4upgbWlzW3COCBcVXROFX+jaNbVIJtjhNiYDK6CGx2S4DjmvPTF9zVqb7b46EycJeQA0yQXLTY2IARRqDTzuXzFzNsvNI6SrnMoexc+M+1GlSHzVOIeiwgxSZtUwYCJ45AnqAul+rliOCj6h2Tdf0BEqAg0jEKaFFSxk/45Qo1J9Yf0llDRSqC1V358+eiNWrag41rxnwJytKkFGZO7ziYdWfdYYWTo72S9NRcIkRvT8338HiS1X3fR2GV2R8VzyycsVFSVpGfIsUUo4v4nkpBOWS7rn4FhnfPapzhd4JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tvz8+mSx/6hAxHUxDTynb8tn5ymhX7NY1MEMEv78HNI=; b=UW+rR3uUg1Bkiv4BqFm76aA8RV3MSMa/Vs0swzYNXEhL0Dg5XX1d5ygdZ17qy8ZYsqrLdOzimZ7nXD1Rpq5oP1tJd6RmVcBJh7WT1PkiCsdMUfoUc8V5W8NFnnFPkHJB652ZgvaJ8uTiuiQj713fzDxaFNXwh1qxxfmqYdfaGiqtwRQ6z06YLgZLUmcLJrOV4Nt7kB2hYicEL3A0vr4X5VsZ66a7wmDnz6HhI6YLidojgr2v5AJ7UCZP6rWBQmb3J2fbBDrF/2fkRZqtW2JiAI5xuruTb82A3jsjQXPZhjbkCwNO2VtIQJTafmbX1udetLbDo6qXgw0/zKqUBddWpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tvz8+mSx/6hAxHUxDTynb8tn5ymhX7NY1MEMEv78HNI=; b=FIeL767mTiUPdglCEGp0XBn9K+5/AXZABKU5/8iZ60SefXxakaRZ9ZsY+am0xXjzgsehOq6kEhH7tJ+oiNfGDbxPFlHGAlcEmqgKcGD+StdCloBLs+V86NhVBfffCuCM0RdizPRfcj2i5ORROyKXyk/CfrZSdtijeC2JtTIYrkY= Authentication-Results: zeniv.linux.org.uk; dkim=none (message not signed) header.d=none;zeniv.linux.org.uk; dmarc=none action=none header.from=oracle.com; Received: from CH2PR10MB4166.namprd10.prod.outlook.com (2603:10b6:610:78::20) by CH2PR10MB4149.namprd10.prod.outlook.com (2603:10b6:610:a7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 20:50:49 +0000 Received: from CH2PR10MB4166.namprd10.prod.outlook.com ([fe80::2c22:7eb8:a2f0:e027]) by CH2PR10MB4166.namprd10.prod.outlook.com ([fe80::2c22:7eb8:a2f0:e027%9]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 20:50:49 +0000 From: Stephen Brennan To: Alexander Viro Cc: Stephen Brennan , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] namei: Standardize callers of filename_lookup() Date: Tue, 7 Sep 2021 13:50:42 -0700 Message-Id: <20210907205043.16768-3-stephen.s.brennan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907205043.16768-1-stephen.s.brennan@oracle.com> References: <20210907205043.16768-1-stephen.s.brennan@oracle.com> X-ClientProxiedBy: BYAPR01CA0022.prod.exchangelabs.com (2603:10b6:a02:80::35) To CH2PR10MB4166.namprd10.prod.outlook.com (2603:10b6:610:78::20) MIME-Version: 1.0 Received: from localhost (136.24.196.55) by BYAPR01CA0022.prod.exchangelabs.com (2603:10b6:a02:80::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21 via Frontend Transport; Tue, 7 Sep 2021 20:50:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 427e157f-5138-4fa2-69d4-08d972412c58 X-MS-TrafficTypeDiagnostic: CH2PR10MB4149: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SjlOc8RWCd5Fc5dwgo5POUuUf1bf7WKgxUWLqNGHE4zdQ4nABdbMkmSXke8CvghrKlltwGAUk55Q9Wk7JQ9baW8lwNPpE5ka1DyhGXyXUb2rar+ZBYPe0PIF0y4RCcpyj04xJvoECSkPSufzPrvQq+55iRGvFaF9jKPeUIt3x1yIHoxOMPdI3BJ09u4tYpwd+r0CT9LYX4mljn4XxxgJvVY5fT8KHpdQBuulbmXZvWQF+8HioWoKZ1lMwCUb32R1RnJcgg0CXdqtDHtGss9xpixqhMMr8Yi8C4h3WHHKLCw+gndH9/NPJmgMs3eVnR8ttdsGcrKx4/P3+zqhX6uV7edqr3z9VvDzhdfPiO2/Hn/iL0p97Vl5YZ2108ci56YUsLzcifwHsgWjakhzbXIFot08MlxWPOvo+y+kxVZ4IKiJjfK6w82H16SmK7ZHwXC8MjlpO0kHFe76XOR1sJvnu8K372G5aWcsHVIxZQTgD9HBeuu0G2qb2jwpoGDLmiOlCsHNZ3dfWdeERavOOmCYT5WoDsK0aNj9MxI03hquimd76cfznhHY71IkoOr9WxxbWHLbmSA0nsyPJqxn6CHFSR2sRzl4w2aUc8ObT1du4pW0ETyEW6/lDP9ig0f2AUke3OKrFbvu2qI7ky70Lr3F31nUfZwQp5b+nMmkaeCsaIArgqIKYgvwMTwILaZZd8rmdQhABDzB8X6IodlIgIGZAmQVS9l64wY819xGXAZ7Ok4JB4p4orBIsZUghi5fJthH4C2f5GiSj2AsnvWSvdb1GZFqrXep0wrCVURswv3CQR1NMs+hRuI7W04GuVj89aL6VFGFFgxNykJVZa14lSdl45K4+oQUqy+mO8ZkcpfwyJrSElVRJqdlBaHrnisPz3WZT+EILw3jZ+R3JkrJ4YHDqrr9Dyu3a5rJcHbxIRQaIgTetnWKR9/VymM5VnTvALa0LaN1gHB71usGBeGVQmA35WSu2om227J77i0LhnAC//I3fos5FxVeqFTO+OEluQDgMj3zmaN6k9kIYPtlK6b8DEvzhZNOHNi1Ace9wSiRWn2OViNVo5E0epN1WsHADrZVrBJFoVQMIN0PACA/Y53TGLsDklz9TYIS4/LyseTbNEY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:5;SRV:;IPV:NLI;SFV:SPM;H:CH2PR10MB4166.namprd10.prod.outlook.com;PTR:;CAT:OSPM;SFS:(366004)(103116003)(83380400001)(6666004)(26005)(6486002)(86362001)(186003)(956004)(1076003)(8936002)(38100700002)(2616005)(38350700002)(8676002)(36756003)(5660300002)(4326008)(66946007)(66556008)(66476007)(316002)(508600001)(966005)(6496006)(2906002)(52116002)(6916009)(23200700001);DIR:OUT;SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BRkWAL6C5G5Z1KxQfCUhy7SL1LRYXQhHavInoBdu1asEczm+G1c/jgXMgq8gNdFRpOGRWuzSBtK22u1JWlx5NsUiITSfb+EBCUdyQZrwPLhfOByo1IKACJhPNhLy40WVR+1UukpFnNoFbSdTZnc0tXXBZUOX+XU8worgeinqMK5o+hIXiQIBH3jwtFt+2e/HOi7R685ADYDV2G28zhOBr1XjRFFRdZi6EiLZrakRtNo1CF/ZLnWaw9rPPpuU3wj6ToamuTYAJ90EhZrnJQ/6KuUhQYgpaqT2XwVgTRj6WqsS9qx5xv8JvuItkoeeDcBeMVrZqsk9ZaTgbHub7o0Bbv9sAWX0CRE4rIA8LuS8HYc3THUFw9VJ7hovapqzGa8hOyhI7lgn877lgroLfUQZ2LA9QOS4MvfUZ6IuNXcG6TBMzJ4UV7634fy1l0xCGxfOcWAa1n6+tlYhTXbsGW0f3IhaU5VhaxRyzNszGlndQI0e85XuFc+Y1dDzvswQK5XPWy6Ahw7NWqyf3DVJSwpDmWcyeyCBTLI2TbuglkITfx+LknFzdrSMM8bFUsHoutCGdeJnDC85nrSW196ogESgwfc8beI8b7z+sm9r5R4fz2GjjudyBFVao2R5emPOG9ElT28nzT1aWv1EoknDXtLdkXDJtOvPjSnmKo7ltEJCAmNJcG8Adp8G7fGkY49F23fahza3vqqhsYxz6J+56a550AhWCXXtxTYBftmxLcfxBaG4QMk5eYSmGGdJ6ujvjOeZ36jy/uM+I71zazyHNbxuYJPNyo/URpIH7XnegSm/JvCnoXl/hA8LKblaytbrp1ORYminhAQLGwv+nDMh9UxSLNNhy5gYbhvqOzbGqzcYYFOn/1Vkh56CaQqBdA67/gSFjW2sZyp4lqH0VnnWQYcXtHT5nTsnsQXI+D6N+TltwNaB7MBNRFyVrTg4vN81TFX9GCo4Y4nQviffRDTdBPQ3IFEn3nXX8SACBucdpCFy2HdhT0uFztxSXMvJ6loaZmL6QfDwSiKMGsHHsd6cdGn97DBZ94hSCB1+UVdh5FuE3Zq4jJBGZnhHSQGqor+jYp2qKmPCOuhhZ5zWWulmrpjOpUA617cIFyfKjUCKYEUqxZUp61F4n8o78LYeu5UfFQN6IPibxdp3JwWfgEqd7IP9+x2hSsxrqUqbbpydpnQKYQuBEVEfpbZ1T4Owv7mYgSea+TI2K26/AEK1ggbvzGkY122zSKWyT7odFZBglyty74J/BWgpcOWPsNJwecM25uaEy/xkutsFC/mCyGliFvzIB6fSLu8DRKJmTtwbo/KydFiKM0N/GrM36yQ7f5nBZc7C X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 427e157f-5138-4fa2-69d4-08d972412c58 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 20:50:49.2805 (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: fXuI7uYXNEdLNg18FEtMptXw9umiDihK8Zz84qia4daxOu+d1CX80RzYSjGp3jCZMTJBylmbXhNK14G7Cj1Hbp56Z7CMOGQ3eV2UHxriPEo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4149 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10100 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001 definitions=main-2109070130 X-Proofpoint-ORIG-GUID: a_UsUKEh1qK5YZxcKWXTdDD_5Meh9Syx X-Proofpoint-GUID: a_UsUKEh1qK5YZxcKWXTdDD_5Meh9Syx Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org filename_lookup() has two variants, one which drops the caller's reference to filename (filename_lookup), and one which does not (__filename_lookup). This can be confusing as it's unusual to drop a caller's reference. Remove filename_lookup, rename __filename_lookup to filename_lookup, and convert all callers. The cost is a few slightly longer functions, but the clarity is greater. Link: https://lore.kernel.org/linux-fsdevel/YS+dstZ3xfcLxhoB@zeniv-ca.linux.org.uk/ Cc: Christoph Hellwig Cc: Al Viro Signed-off-by: Stephen Brennan --- fs/fs_parser.c | 1 - fs/namei.c | 41 ++++++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/fs/fs_parser.c b/fs/fs_parser.c index 980d44fd3a36..3df07c0e32b3 100644 --- a/fs/fs_parser.c +++ b/fs/fs_parser.c @@ -165,7 +165,6 @@ int fs_lookup_param(struct fs_context *fc, return invalf(fc, "%s: not usable as path", param->key); } - f->refcnt++; /* filename_lookup() drops our ref. */ ret = filename_lookup(param->dirfd, f, flags, _path, NULL); if (ret < 0) { errorf(fc, "%s: Lookup failure for '%s'", param->key, f->name); diff --git a/fs/namei.c b/fs/namei.c index f2af301cc79f..76871b7f127a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2467,7 +2467,7 @@ static int path_lookupat(struct nameidata *nd, unsigned flags, struct path *path return err; } -static int __filename_lookup(int dfd, struct filename *name, unsigned flags, +int filename_lookup(int dfd, struct filename *name, unsigned flags, struct path *path, struct path *root) { int retval; @@ -2488,15 +2488,6 @@ static int __filename_lookup(int dfd, struct filename *name, unsigned flags, return retval; } -int filename_lookup(int dfd, struct filename *name, unsigned flags, - struct path *path, struct path *root) -{ - int retval = __filename_lookup(dfd, name, flags, path, root); - - putname(name); - return retval; -} - /* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ static int path_parentat(struct nameidata *nd, unsigned flags, struct path *parent) @@ -2571,8 +2562,14 @@ struct dentry *kern_path_locked(const char *name, struct path *path) int kern_path(const char *name, unsigned int flags, struct path *path) { - return filename_lookup(AT_FDCWD, getname_kernel(name), - flags, path, NULL); + struct filename *filename; + int ret; + + filename = getname_kernel(name); + ret = filename_lookup(AT_FDCWD, filename, flags, path, NULL); + putname(filename); + return ret; + } EXPORT_SYMBOL(kern_path); @@ -2588,10 +2585,15 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, const char *name, unsigned int flags, struct path *path) { + struct filename *filename; struct path root = {.mnt = mnt, .dentry = dentry}; + int ret; + + filename = getname_kernel(name); /* the first argument of filename_lookup() is ignored with root */ - return filename_lookup(AT_FDCWD, getname_kernel(name), - flags , path, &root); + ret = filename_lookup(AT_FDCWD, filename, flags, path, &root); + putname(filename); + return ret; } EXPORT_SYMBOL(vfs_path_lookup); @@ -2795,8 +2797,13 @@ int path_pts(struct path *path) int user_path_at_empty(int dfd, const char __user *name, unsigned flags, struct path *path, int *empty) { - return filename_lookup(dfd, getname_flags(name, flags, empty), - flags, path, NULL); + struct filename *filename; + int ret; + + filename = getname_flags(name, flags, empty); + ret = filename_lookup(dfd, filename, flags, path, NULL); + putname(filename); + return ret; } EXPORT_SYMBOL(user_path_at_empty); @@ -4421,7 +4428,7 @@ int do_linkat(int olddfd, struct filename *old, int newdfd, if (flags & AT_SYMLINK_FOLLOW) how |= LOOKUP_FOLLOW; retry: - error = __filename_lookup(olddfd, old, how, &old_path, NULL); + error = filename_lookup(olddfd, old, how, &old_path, NULL); if (error) goto out_putnames; From patchwork Tue Sep 7 20:50:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Brennan X-Patchwork-Id: 12479313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 394DDC433EF for ; Tue, 7 Sep 2021 20:50:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 208BB60EE6 for ; Tue, 7 Sep 2021 20:50:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346881AbhIGUwE (ORCPT ); Tue, 7 Sep 2021 16:52:04 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:39270 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346837AbhIGUwB (ORCPT ); Tue, 7 Sep 2021 16:52:01 -0400 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 187HsjPl028050; Tue, 7 Sep 2021 20:50:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=4sTvAgC4wLd3w7mcFPV08K3eue6H6jOyAAAWiW9dwSA=; b=sTfaF+Km+euupxyxHiP4oX4Q0u0hvzNBIa+y9vjoCKU6iXdbjjCVb6F55k5NJmUQqHm0 +R/P5sH7Nv/60Ohu5xbufSWRLQCiEu8Kuor7QYdKgv77fW2uSQPqVtNMN/tE7QCozUoZ TG9jojbd+YPYcK4j6qqsAXRu9/nfopcqvxMa6cl/IVi7rrRgJ4keyfDsh3Ck9ngf91Lt 8CADRi4s5FrXIp8X7Y5PEdKASKNICIMzgR/bB8NuwQTXG0jPw9p3jkiuFl6J1HGFQIia CB6OlVgnMMNcHz8TE3sD2neEXblJr8QYx4HgXAVftKk9iq/oyoLGtudRoqDvlqTFqTyL Vw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=4sTvAgC4wLd3w7mcFPV08K3eue6H6jOyAAAWiW9dwSA=; b=te29K1kbP+E+7kY7OTcq98C+BV56MQjUvhv8qFfsSqxo8qwuGR80++TKj0Re89okQ6ko v6mbxyp3v9rkKXWYPU4Ah6XQ1JzODxNJjvX+pahwkFXGg+ZG6y5oLm4M+bgOlytL5JkB ELsgLpfk8uppUE6T/xo9ep2qdbtgfTO81IjZEoB8s0841k7Mm8SmlCk9HRcQgmoWPP+8 N4nbnmdt583+g4Zm3/wZfEBlMFadieiQOjKPpgirc+Di5oSE32Cg7MRq54XioP70lhmS Xm6U2M6EE8/9CGKekFheSmjIyPM69yn394oVIuCX1984/KzIjm8gn2MDrzstSBUvCoPG hw== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3axcw68eme-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Sep 2021 20:50:54 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 187KolUj083023; Tue, 7 Sep 2021 20:50:53 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam08lp2045.outbound.protection.outlook.com [104.47.73.45]) by userp3030.oracle.com with ESMTP id 3axcq08k3r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Sep 2021 20:50:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F7Hu2PoC+YulQh1xWcSkEFB9EbpjYjMSoQ5noNsQYjKVJUGmYNrpUZSBnbfYfmitKHbzrtIlHDtS3sM6uFkIaDfkUiQvlPx2ymxS5dK+AX4jLHfhrqebuXIDiYughQzs4VAmVu6qfGbCtzz4/a36TUVMAYg1S6hWrdxx59LQfETLKQekx4ulhSGCtLDKln/p2eQYDv/FoGjKTzE7150y4IhVJnrYHxsYOrPeucSDZR0JmpJ8p7YA9jiRTx1oMFqydd9xdIDBH4AkdNmAfW6uGs3UccKlimVq01uJugaKwMB/+vj71pW+hTN2gbyZ3PCVh66mvYDPXNJQGkMZ1UQ5kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=4sTvAgC4wLd3w7mcFPV08K3eue6H6jOyAAAWiW9dwSA=; b=Zo1df3PLpP3rPoMDpzLNTk2f+Lbv2RbFjHdTTsKy17k7R9AofjUlSB9YE5Idxqx86Cd/8w4856EizI1tUa6AT3Qgs6tBdG7y/X6Hvpy684V/yhDyeCGaTWHh3LPKkZM4TNdNoKgqULwN+t0qM18He9AXHay09pFo2AbFgNIG2Ds3ob/1spoaFP760XHnrp1Sp/+5f1WWKzUM2sjFuoni1f6TYMsK8K3iYLZoW8r0MgNpkQCQ1C0/VhmLGCl8CC24JBYtvrCwW5XyfjIhC+6Sos7SrTFoGgiT/KlzuBf9EDYR1Al2fBmFhm/vFTfMQARXUULIjQCA273ESsAcK/kKGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4sTvAgC4wLd3w7mcFPV08K3eue6H6jOyAAAWiW9dwSA=; b=ogWy1vE5uXtmNVZgh7Wg5gHbfHKuoV768iXM3Uqn7Ct7DfvHZj238F6D+CGCI76NduLy2bg2+WLyeVEHl2HgDrPEvaYbJXbpFxRfhbRbml+ww2KCIHR2SuGFtMTqArLzQLjOhWdiWfc5rLqmhE8dHAmo0FQbENQrHVO+opWIABY= Authentication-Results: zeniv.linux.org.uk; dkim=none (message not signed) header.d=none;zeniv.linux.org.uk; dmarc=none action=none header.from=oracle.com; Received: from CH2PR10MB4166.namprd10.prod.outlook.com (2603:10b6:610:78::20) by CH2PR10MB4149.namprd10.prod.outlook.com (2603:10b6:610:a7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 20:50:51 +0000 Received: from CH2PR10MB4166.namprd10.prod.outlook.com ([fe80::2c22:7eb8:a2f0:e027]) by CH2PR10MB4166.namprd10.prod.outlook.com ([fe80::2c22:7eb8:a2f0:e027%9]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 20:50:51 +0000 From: Stephen Brennan To: Alexander Viro Cc: Stephen Brennan , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] namei: Standardize callers of filename_create() Date: Tue, 7 Sep 2021 13:50:43 -0700 Message-Id: <20210907205043.16768-4-stephen.s.brennan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907205043.16768-1-stephen.s.brennan@oracle.com> References: <20210907205043.16768-1-stephen.s.brennan@oracle.com> X-ClientProxiedBy: BYAPR01CA0029.prod.exchangelabs.com (2603:10b6:a02:80::42) To CH2PR10MB4166.namprd10.prod.outlook.com (2603:10b6:610:78::20) MIME-Version: 1.0 Received: from localhost (136.24.196.55) by BYAPR01CA0029.prod.exchangelabs.com (2603:10b6:a02:80::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 7 Sep 2021 20:50:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ba3443c-dc9e-442d-d30e-08d972412d7f X-MS-TrafficTypeDiagnostic: CH2PR10MB4149: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n9tj/IqDPh8EcLjX2pezP9sN/eW0v+HQSkW12xErocS2+x/49TDP4LkAY+pghKra9Bnz2qcrdbU32Ih7WGk3nOel4Y8dJDYbl5L+kQyRiJ2AERTYAMQrUlXGOhs1gBFV+N67BYuieyYDsMAGdx836AVs9zqFertwo87xmtsYiK7X+ZGgid/lHWrphvBXtEgGlhLygt2FCwKXoDEpDd2MXA9aiWjeINcGO4+SrUKMWzsTu8aM2g6KmU1TweTrWumiGPvV5c71lo+8vis3DSiu3uge04nAjFlMpiOfAO6zw/rEAwh29Ab3LVEVPgLAK1+xWqtXVceRkofEr7TOENesPTq1CFhuEaibna67CzJVDu2NJ+ARaKGwpMJ0hzv/GuX+m5NHh7zD5/0vv+HtusEmB7D9o111M0RjI2bFW+7PqgzJsGMAAsKXnnok9tzOIsm0wUKeLQX8vpfwFClw0kU3ehqBeJ1m+AO7rS/r1kgi4A6lJY+KjcfnZI/L7UqpnLL8OKXUwK9GxQOvZwS/YScE857IKdyhnd61rdUh9XfCcLxReZ+cmGT3SQginnfgfH6ynkjD6ivMHYBOLF1SQ6i1+AvIJnGVcvFv1wO4rtnwmdCNrNpKt7iQkbOqKqbWyWSfmj3wc5MkEl3DaItpawUfBc90E2+IA59tnVk4gyJElyH1RFbP6LkiltiYp8YwoWF98jVABf6L00XMQ5NwEufIKKG/tOdipW3jltsWikogQJnwBLOCIsAwTJtxQekhiuSNKXCjQscgMXvwZ0IpZXKcjYpcuoKwunDKUp4aCzse+CrbR5kOC4QR+kf4kukg6K41Pn9a21DFa+l2Djwk13elNjgeByZ0P4PES7iyjEhSlYYLa8v5z2BhG32HYYzT/2XYWPQappKZozFAc3dpYCB7Du5C77QdDOhInDBinioilIu6j2td6f0GHcykJhahScwNWnK4lOPY9Qb7Dc69snkaPb8m1g4EDyUGzns/eDbYcPyoNJ6yohJq/mLr6WDvqbaRhZJ6OKVqWOtYgQvu2wvi1RS68iN929dk5O07uw15+2NCBQuXBpZ/D0s85vhZUW9mZHVa9bMeWlUHb/UQk/zyumtm22+/6SJjokECWeojNyc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:5;SRV:;IPV:NLI;SFV:SPM;H:CH2PR10MB4166.namprd10.prod.outlook.com;PTR:;CAT:OSPM;SFS:(366004)(103116003)(83380400001)(6666004)(26005)(6486002)(86362001)(186003)(956004)(1076003)(8936002)(38100700002)(2616005)(38350700002)(8676002)(36756003)(5660300002)(4326008)(66946007)(66556008)(66476007)(316002)(508600001)(966005)(6496006)(2906002)(52116002)(6916009)(23200700001);DIR:OUT;SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: amTw9SKoDpED4j+AerHHxxOMseU+hBZbgtnLt7IpQQ5/u1zjqeMSuD1eJby1e+oSR46xCbP/Snmaa3FzUfYOxiv4NvOhrfi8UqCfkY0ObGaoMxbXwnHTo2uE5nfHVN3k2GDWrp5UJKWZuDK541+HUPQ6UiFDStjcN7WA8sNyTYnvYE5POXkee6fG3ncqXUVNY5c6fhFQmhZfLK/okH5KUU7ldW5sNnv4L3MlZgQT/1NIqyr/1jG6iRX/8SLz6vFwUUG95L1ibj/C6eRSybvIJis6LOPT34ly3JCeCQiUtnBkSwTollnGAt8fS1W7j18JDsdx8fF/CbLW/i40cqZkJ3Q5Q/5HDMCct9ra+PPneV6V3kJTXebNxd/rOMcOSJm3ItLQA+JUWNOmIY7NgnnYDw5n2h494zZZXxXmEt2UnTegmZpkhKQlljly4oN/i93tBUjqhEdXp2EGVd8Sz6jZBp4KEcbtbhWa7CnWJY7H9j67SVQkDn5OXfib441XbprTjzdtQA3Mq96n4Sb4u1+bmY/hixRCfuLuuQ6gibbJ4hqPW6mFIXlgaphf925kAeKDRpCo3w1lgj2bYVPI38apNkvNr6xeG2E/q3B4OVqqIFa4wx/3WJthzSvRj/KVInMu6YfexvtHdAq98fupL4UBHs1MjgORQzOG13WHos8wLJto4vJ/yccOiT7bBHvOBRRQ+dFd58s04mEHNZ3Rb7yz9nqzmtFIgMfEuh70qGXUaAFuH2l3pBsYvTUaUycoBumGpdnjid/ySQ34Cw8/xckTnNGePmv8UBLi+JBXehOVie1EU6JZ/8fo14E3Q56WerBGfumcdDxvXzXZ+TZ7+jBQIV10oxiAMaSUfaZ+ch421YXp5mk8nkR1SbuFGV91Ro177F6BTRZBHiBsujkvIIWEcttda/C2kgHWBUPAm0oSN77QYc0yg7LSsOMIToZXN5kBGpr8EP9fWQlrMv9rT0uwLTS9xddL1aY4A0vWejBKXg2ukEzB6iNfKTXnH6vGhTRS6VJOQofKsAjC3cmhnScTLqVZ20zaoorOPZizL7O7Edh+dRausu5Q6fANRQ6y0P+kPUuiwTlCaSVgFiABCcbEDqPOG5zk5uPIauOL0jLSuzbx325tHfoje0i/ftlZXaQqK5jr4FI7T3JwWU8sThHMGTFGZ/voHVcqfdrpKV4qlSPhnQ9OnkQYaOWvP+rUpwiXqf7o7T9Ij7BetH8gok9Id0l+K0SdhuGOywtYO96ps3TJ7sinJGA6ud/L1+rIyEJk08K/sVbuqZwL1yGu3fmVlcxNR5NsF7ZtAbwLhs8vRMRjnlhLwikHkmCB1dcAkD5O X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ba3443c-dc9e-442d-d30e-08d972412d7f X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 20:50:51.2707 (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: rVRJFRFsrEJU5y+K3y1ycZkqe0esdN60836k5K6iifurcoKt+YvpZjnXVLd5/DkYk1JSj6yBBGI9Us9YuQ25wRrPzSU/TTbAb8z/9tjFxOM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4149 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10100 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001 definitions=main-2109070131 X-Proofpoint-GUID: mAO8BuZGWe5F7iDUMjg3BycVH2RO640E X-Proofpoint-ORIG-GUID: mAO8BuZGWe5F7iDUMjg3BycVH2RO640E Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org filename_create() has two variants, one which drops the caller's reference to filename (filename_create) and one which does not (__filename_create). This can be confusing as it's unusual to drop a caller's reference. Remove filename_create, rename __filename_create to filename_create, and convert all callers. Link: https://lore.kernel.org/linux-fsdevel/f6238254-35bd-7e97-5b27-21050c745874@oracle.com/ Cc: Christoph Hellwig Cc: Al Viro Signed-off-by: Stephen Brennan --- fs/namei.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 76871b7f127a..0d3ce04c55ad 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3622,8 +3622,8 @@ struct file *do_file_open_root(const struct path *root, return file; } -static struct dentry *__filename_create(int dfd, struct filename *name, - struct path *path, unsigned int lookup_flags) +static struct dentry *filename_create(int dfd, struct filename *name, + struct path *path, unsigned int lookup_flags) { struct dentry *dentry = ERR_PTR(-EEXIST); struct qstr last; @@ -3691,20 +3691,16 @@ static struct dentry *__filename_create(int dfd, struct filename *name, return dentry; } -static inline struct dentry *filename_create(int dfd, struct filename *name, - struct path *path, unsigned int lookup_flags) -{ - struct dentry *res = __filename_create(dfd, name, path, lookup_flags); - - putname(name); - return res; -} - struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path, unsigned int lookup_flags) { - return filename_create(dfd, getname_kernel(pathname), - path, lookup_flags); + struct filename *filename; + struct dentry *dentry; + + filename = getname_kernel(pathname); + dentry = filename_create(dfd, filename, path, lookup_flags); + putname(filename); + return dentry; } EXPORT_SYMBOL(kern_path_create); @@ -3720,7 +3716,13 @@ EXPORT_SYMBOL(done_path_create); inline struct dentry *user_path_create(int dfd, const char __user *pathname, struct path *path, unsigned int lookup_flags) { - return filename_create(dfd, getname(pathname), path, lookup_flags); + struct filename *filename; + struct dentry *dentry; + + filename = getname(pathname); + dentry = filename_create(dfd, pathname, path, lookup_flags); + putname(filename); + return dentry; } EXPORT_SYMBOL(user_path_create); @@ -3801,7 +3803,7 @@ static int do_mknodat(int dfd, struct filename *name, umode_t mode, if (error) goto out1; retry: - dentry = __filename_create(dfd, name, &path, lookup_flags); + dentry = filename_create(dfd, name, &path, lookup_flags); error = PTR_ERR(dentry); if (IS_ERR(dentry)) goto out1; @@ -3901,7 +3903,7 @@ int do_mkdirat(int dfd, struct filename *name, umode_t mode) unsigned int lookup_flags = LOOKUP_DIRECTORY; retry: - dentry = __filename_create(dfd, name, &path, lookup_flags); + dentry = filename_create(dfd, name, &path, lookup_flags); error = PTR_ERR(dentry); if (IS_ERR(dentry)) goto out_putname; @@ -4268,7 +4270,7 @@ int do_symlinkat(struct filename *from, int newdfd, struct filename *to) goto out_putnames; } retry: - dentry = __filename_create(newdfd, to, &path, lookup_flags); + dentry = filename_create(newdfd, to, &path, lookup_flags); error = PTR_ERR(dentry); if (IS_ERR(dentry)) goto out_putnames; @@ -4432,7 +4434,7 @@ int do_linkat(int olddfd, struct filename *old, int newdfd, if (error) goto out_putnames; - new_dentry = __filename_create(newdfd, new, &new_path, + new_dentry = filename_create(newdfd, new, &new_path, (how & LOOKUP_REVAL)); error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry))