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 1E53FC433EF for ; Thu, 20 Jan 2022 02:08:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65E7A6B0085; Wed, 19 Jan 2022 21:08:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 60DAF6B0087; Wed, 19 Jan 2022 21:08:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 488B46B0088; Wed, 19 Jan 2022 21:08:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0061.hostedemail.com [216.40.44.61]) by kanga.kvack.org (Postfix) with ESMTP id 3578A6B0085 for ; Wed, 19 Jan 2022 21:08:09 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id F0C2A90F5D for ; Thu, 20 Jan 2022 02:08:08 +0000 (UTC) X-FDA: 79049030256.19.413BAC3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id 9DCC010001B for ; Thu, 20 Jan 2022 02:08:08 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CB66C61546; Thu, 20 Jan 2022 02:08:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F330FC004E1; Thu, 20 Jan 2022 02:08:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1642644487; bh=beR2Q+lgjAp31M9iuMaXrGizo7tdX/x6zmHnsRtjZys=; h=Date:From:To:Subject:In-Reply-To:From; b=11/LvqBta/zyRP6Zv1D0i6k6L5xyaB9XQ65fibCDooo2Sq8OJ1DS7cPdljYRGfXbi 9LztaeVv2K0UbC7Marrl0PKx2Btk0MtdCaGjnxkxMO59Pbe0bFSY9NUTsndi2DPEP4 9I6HNcYSJV+HBGcxCpLNHzxheJWpwMPDrQm3k7dA= Date: Wed, 19 Jan 2022 18:08:06 -0800 From: Andrew Morton To: akpm@linux-foundation.org, christian.brauner@ubuntu.com, geert+renesas@glider.be, linux-mm@kvack.org, mcgrof@kernel.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, yzaikin@google.com Subject: [patch 08/55] sysctl: fix duplicate path separator in printed entries Message-ID: <20220120020806.jZyCq3_OC%akpm@linux-foundation.org> In-Reply-To: <20220119180714.9e187ce100e4510de3cd9f7d@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: 9DCC010001B X-Stat-Signature: 3uscghrgf51495hsrr1rseou1wfq8d1w Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b="11/LvqBt"; spf=pass (imf14.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspamd-Server: rspam07 X-HE-Tag: 1642644488-121016 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: From: Geert Uytterhoeven Subject: sysctl: fix duplicate path separator in printed entries sysctl_print_dir() always terminates the printed path name with a slash, so printing a slash before the file part causes a duplicate like in sysctl duplicate entry: /kernel//perf_user_access Fix this by dropping the extra slash. Link: https://lkml.kernel.org/r/e3054d605dc56f83971e4b6d2f5fa63a978720ad.1641551872.git.geert+renesas@glider.be Signed-off-by: Geert Uytterhoeven Acked-by: Christian Brauner Acked-by: Luis Chamberlain Cc: Iurii Zaikin Signed-off-by: Andrew Morton --- fs/proc/proc_sysctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/fs/proc/proc_sysctl.c~sysctl-fix-duplicate-path-separator-in-printed-entries +++ a/fs/proc/proc_sysctl.c @@ -163,7 +163,7 @@ static int insert_entry(struct ctl_table else { pr_err("sysctl duplicate entry: "); sysctl_print_dir(head->parent); - pr_cont("/%s\n", entry->procname); + pr_cont("%s\n", entry->procname); return -EEXIST; } } @@ -1020,8 +1020,8 @@ failed: if (IS_ERR(subdir)) { pr_err("sysctl could not get directory: "); sysctl_print_dir(dir); - pr_cont("/%*.*s %ld\n", - namelen, namelen, name, PTR_ERR(subdir)); + pr_cont("%*.*s %ld\n", namelen, namelen, name, + PTR_ERR(subdir)); } drop_sysctl_table(&dir->header); if (new) @@ -1626,7 +1626,7 @@ static void put_links(struct ctl_table_h else { pr_err("sysctl link missing during unregister: "); sysctl_print_dir(parent); - pr_cont("/%s\n", name); + pr_cont("%s\n", name); } } } _