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 BCB02C19F32 for ; Wed, 5 Mar 2025 19:04:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6268528001B; Wed, 5 Mar 2025 14:04:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B2F8280003; Wed, 5 Mar 2025 14:04:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42D2D28001B; Wed, 5 Mar 2025 14:04:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1E131280003 for ; Wed, 5 Mar 2025 14:04:50 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 14BD21C69EF for ; Wed, 5 Mar 2025 07:18:15 +0000 (UTC) X-FDA: 83186643750.03.5F13FA4 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf02.hostedemail.com (Postfix) with ESMTP id 4760080006 for ; Wed, 5 Mar 2025 07:18:10 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741159093; 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: references; bh=LNkk2QUYVRE9dDHBNW/Jp4glK2/JUJuAIdhBAtyauho=; b=QX9vKkypyjAgGm9yp7Nqr4ZG89sBC3KrMU56fv7D3Zby6v03igDNPDeeOIcNUq2fUU5oqG Hbps14032/1oDJI96zJTqUW7KCdE28xeLefrD1cPCnJthiumLzRo5JNxC/MDJDnFa4h3pU 8A7WW5R3/OdsrW7Jdq5AZ1eASZRgsbE= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741159093; a=rsa-sha256; cv=none; b=WqkQWpWlTfxidfbPcCN2eKmdLosK6crqlvfgM1srpcnAFBXWdN6X8NBSBK3pFp9SkjYMKc It3XcJ+KqHR6o1K+02x6Y0PUupFfFpk7sMvWlUtCk32ilIANxL5SpKyVGbcTu/GK9b+DNm XKPhTTAgkhg1z9LSIDlr/43hbqsiI/k= X-UUID: fa4cb2e8f99111efa216b1d71e6e1362-20250305 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_TXT, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED SA_EXISTED, SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS DMARC_NOPASS, CIE_BAD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO GTI_C_BU, AMN_T1, AMN_GOOD, AMN_C_TI, AMN_C_BU ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:3b56a26c-4a68-4eb0-8273-47a82070a962,IP:10, URL:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-5 X-CID-INFO: VERSION:1.1.45,REQID:3b56a26c-4a68-4eb0-8273-47a82070a962,IP:10,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6493067,CLOUDID:dfce84a5b08fa50e1769222d2197d96c,BulkI D:250305151804YU9YWGP2,BulkQuantity:0,Recheck:0,SF:17|19|24|38|44|66|78|10 2,TC:nil,Content:0|50,EDM:-3,IP:-2,URL:11|1,File:nil,RT:nil,Bulk:nil,QS:ni l,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC: 0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI, TF_CID_SPAM_ULN X-UUID: fa4cb2e8f99111efa216b1d71e6e1362-20250305 X-User: liuye@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1321683669; Wed, 05 Mar 2025 15:18:03 +0800 From: Liu Ye To: akpm@linux-foundation.org, david@fromorbit.com Cc: zhengqi.arch@bytedance.com, roman.gushchin@linux.dev, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Liu Ye Subject: [PATCH v2] mm/shrinker: fix name consistency issue in shrinker_debugfs_rename() Date: Wed, 5 Mar 2025 15:17:59 +0800 Message-Id: <20250305071759.661055-1-liuye@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 4760080006 X-Rspamd-Server: rspam09 X-Stat-Signature: sfk5cekk3ssr89cqcnjpd3t818amr1od X-HE-Tag: 1741159090-645411 X-HE-Meta: U2FsdGVkX18DKGionQ+IdL6QaQDQGb8sGwwlzppNSRDF97LMd17bIlWHQAoqWKVtLLlioQTpIHXGtnKQpsYdtQrpYf/oeeGuzgqaWJkW7Axx6CxFzxbr9NnAz4OhDp/Fsc2ZlpOAUSzFsU83DGq9Ns8l75Leo7YpMzO21IfMQdAF/bLO3C5XB9Tq4smb9qgdueb8L08zG1BqbbWd/4wX8cY21IeTKgzc0L0pk2mLwKXyJVA5YNSMEJo6mnNkejTWgvLZsCOc2PBvzjN7dBb3M6/1uVudpNVazskk+4YFzTxOK34R6rudogeFF8HfHg7nGVlPHLbjaeteUqmLzkkTzqIUioBPl898no2MfLGlWxxw0MemPB5a1Bz/+1e1RDyw7lEwMmapOKrO8fVc/XhYbi1I2Y+aHS7x++e7R1bpHKgi8HAcyETD4XBQnk7AEOXLX3tcKKkfwBVmX/xOPhp2arqj7jgfwNnEBp/xk0/LD61YqU5+nawDeY5sHoyaQCjG+6jxqAIhgnKRIAXsvaUjT79DWxWvb3cZWH0hX+X3NwVCroJSjprNy1uq7NmV3TiC4xH6bBVvXtcFhVkwvbNQAC61PJRYM0CsGZRyk6htJCrhjvfOZiIUgkfbPfWYIqVFAJ8Esk0wdSsdCMijH+pAZDmcdyZL3xtdJCKRPjujqZhu4bBOXrtBNDsOrYiwQkEtCqB2tn5KryLcB1eJLNLugPPWxepnOo223COovp/KC0mzfH1oVaVkYB3T41VaAsXr2kIm0xXn+MGTY+Ug7o7W2li1fJcHVjBkosQS4d8HnObOZqRJ00lg7klt64gYQrE9107MlH8HU28Rme8eE90dO6PjVKABLolEJsb99rLb2T7BF3/Mtj3E+zl6AvRaQPclx75BbsKA2Ug0aeObrvC2QKbjjhp4EjHtulBVP//EP0uXYkqwjzqY2HRcxuiQDViyOCSk52I6lYzgr8iecK6 HQ9QjC1Y jzCZNB20B5v7dLOpbH639Dg7pHSFTHs3SQp7FzJyWiFZuWa9O+46TEni4fVQY654WSVeKr6T3vdqfXXODrO93MqMq532Pdnu23ikpinX2opBfpun1KcVWvF6THkzrPBxpZ61+flre4fmzChg= 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: After calling debugfs_change_name function, the return value should be checked and the old name restored. If debugfs_change_name fails, the new name memory should be freed. The effect is that the shrinker->name is not consistent with the name displayed in debugfs. Signed-off-by: Liu Ye Reviewed-by: Muchun Song Reviewed-by：Qi Zheng --- V2: Modify the subject add Reviewed-by. --- --- mm/shrinker_debug.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c index 794bd433cce0..20eaee3e97f7 100644 --- a/mm/shrinker_debug.c +++ b/mm/shrinker_debug.c @@ -214,10 +214,14 @@ int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) ret = debugfs_change_name(shrinker->debugfs_entry, "%s-%d", shrinker->name, shrinker->debugfs_id); + if (ret) { + shrinker->name = old; + kfree_const(new); + } else { + kfree_const(old); + } mutex_unlock(&shrinker_mutex); - kfree_const(old); - return ret; } EXPORT_SYMBOL(shrinker_debugfs_rename); -- 2.25.1