From patchwork Thu Mar 23 12:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 74053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2886597wrt; Thu, 23 Mar 2023 05:42:33 -0700 (PDT) X-Google-Smtp-Source: AK7set/CsQcjYrBiFRUIhfpm9M8iHNm/48S7NlXpe5no3wmMl0l5KcOVRj70x8dmd9yQpU/r7wtG X-Received: by 2002:a05:6402:742:b0:4fb:3054:232e with SMTP id p2-20020a056402074200b004fb3054232emr9712934edy.26.1679575353274; Thu, 23 Mar 2023 05:42:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679575353; cv=none; d=google.com; s=arc-20160816; b=N9vacN1DC3IQtZ1Y/GHY7AqkKe6jOzUUtKz8lLOpEqpe7Iy6xCDWiLFDcq/7M0Ivsc X+/qt5TcCtoW7AFCjtl6oo9QyJM1S63eCwLB46JvcHMVQpf6mBDbzzac3DtNKIcyodeL uQPlSUdrLG9ELveq2tVl1aXt0Cbrm1J+Ea/v0cnnozzkmouPt1RLA5W8WsAkP54kv692 lbbNmq0bpavYVNFKuRZ7yYK9ttfds6T0kfzD/isIBBlIHpL/+XGOIDk9BtXMGJerIb1m +jgU7ZaW6SJsqmA8a/Pb6GyBO9PgrNsdbUwBi0U64wvOGaUqSc78ZjwVf3TKMU359ifW Wx9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Z16ih4cqVOH/EwDY9V+JvxP7wVmUGDKkr6F8+Xwy+j8=; b=orADtDIu/RpwUgI4CZyRtjt+cZVZ6qRf169N3hjwUCLD6+u+iB3/OS/CQosB+Q8+du +ZLtm3hWbzBJzffTsK91Uepu0y51Jku5wssqHUuplLEZA0EdTLD9OA2l/b+zb4pbUdwj AFuUIPAa+x0dTbGFP6PvXHBJ4m44qbmFAMO71b0RKidRiBprqJx33m9QIZwtBx57ozCr OIJQHEjijUSlJklR3t0AZv6Fv9oybwHa5mBeqhw2dqf4Op28mS8c2/1ryD4WGYOBNJZD 3lcuvWRQ64b+HFW1oJsJmShZVP4swpUt0qBfPTnh38y5ETzntgAOhu/BhJPF5IYj0Z3s yqzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JlFNifkK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b7-20020aa7c6c7000000b004fd241e4783si18563578eds.610.2023.03.23.05.42.10; Thu, 23 Mar 2023 05:42:33 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JlFNifkK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231826AbjCWMgt (ORCPT + 99 others); Thu, 23 Mar 2023 08:36:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231848AbjCWMgm (ORCPT ); Thu, 23 Mar 2023 08:36:42 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A33071CF41; Thu, 23 Mar 2023 05:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679574998; x=1711110998; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OAAjRWa/GMe3Eyh4EzhGnD6aqq4E5v6Kahs4zyE3gnQ=; b=JlFNifkK2vnleKWitd8wXZANVEYiicxQLwnQXd87xpz+53z7ivSXme5e LFqVkMfbRvJP46qEMHryBS4MDn3vyHQ+D1UxsHJbeOuoWsMY98G84facW ouoTF3riOFnLy1aoNup3eimJ1HjUhqhC4DWNtKLGXvj+TW12ykCmx2Osi AYcn1BTuhfIMtuVkSEPkuaB3T/QXZ6YEetm/zC/ERsg6Jk4wrj1hV2qsJ r64rGSUDMpLDsJe/jq5xyPWPfuodcVCnqk/z4PEIUMq14kfIz/uX89CpO 8NmlNF78jg8jhnqn2Q6VuREvkwyJwWI7ERw0rqVDLQyjlPdhVa1S2k6kO g==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="341011540" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="341011540" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 05:36:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="856466578" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="856466578" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 23 Mar 2023 05:36:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 237F794; Thu, 23 Mar 2023 14:37:07 +0200 (EET) From: Andy Shevchenko To: Kees Cook , Greg Kroah-Hartman , Andy Shevchenko , Cezary Rojewski , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Theodore Ts'o" , Jan Kara , Andy Shevchenko , "Rafael J. Wysocki" , Jan Kara Subject: [PATCH v2 1/3] jbd2: Avoid printing outside the boundary of the buffer Date: Thu, 23 Mar 2023 14:37:02 +0200 Message-Id: <20230323123704.37983-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> References: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761162405657223542?= X-GMAIL-MSGID: =?utf-8?q?1761162405657223542?= Theoretically possible that "%pg" will take all room for the j_devname and hence the "-%lu" will go outside the boundary due to unconditional sprintf() in use. To make this code more robust, replace two sequential s*printf():s by a single call and then replace forbidden character. It's possible to do this way, because '/' won't ever be in the result of "-%lu". Signed-off-by: Andy Shevchenko Reviewed-by: Jan Kara --- fs/jbd2/journal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 8ae419152ff6..6e17f8f94dfd 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1491,7 +1491,6 @@ journal_t *jbd2_journal_init_inode(struct inode *inode) { journal_t *journal; sector_t blocknr; - char *p; int err = 0; blocknr = 0; @@ -1515,9 +1514,8 @@ journal_t *jbd2_journal_init_inode(struct inode *inode) journal->j_inode = inode; snprintf(journal->j_devname, sizeof(journal->j_devname), - "%pg", journal->j_dev); - p = strreplace(journal->j_devname, '/', '!'); - sprintf(p, "-%lu", journal->j_inode->i_ino); + "%pg-%lu", journal->j_dev, journal->j_inode->i_ino); + strreplace(journal->j_devname, '/', '!'); jbd2_stats_proc_init(journal); return journal; From patchwork Thu Mar 23 12:37:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 74052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2886362wrt; Thu, 23 Mar 2023 05:42:02 -0700 (PDT) X-Google-Smtp-Source: AK7set/V1j6bs8hlICcxkwVLmJPzNOEeDGg6Dk189eGoSzewAv1ad/NsppAhaNoGa0D2EoL0+v2A X-Received: by 2002:a05:6402:b34:b0:4fa:7679:d44a with SMTP id bo20-20020a0564020b3400b004fa7679d44amr9104877edb.11.1679575322245; Thu, 23 Mar 2023 05:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679575322; cv=none; d=google.com; s=arc-20160816; b=eeszjhCc26zFZ/fIfwYDfnYci/TAFk1woXyjJGOlf2O0f+28hg4AtHvUmjFnKjpZMn kpKgNK5DaIjg00xrm+E3RywLgDkCwYHLb2Am5gEFSo8RHY8K1iJL89er1XSIp+s7KID1 wmxJ1kXEH9UbKmt4sO4a3l8lxphZmQOEr3uhNG4gz46gkgkWzwoO/D/FZ/1D9XzRGFiB TgoQVmXV7feg5fRJDlC+dNWxd1VvHpqZFT5LJc7Jxy64A4BTor+0sJIhpacWMM8Yp87D iDCD0XH/HUQOTNdQ4hoXPBwuK7ap/iD++hBNXKIoHvLXU6V/PnDvEZKU059DBP/Pj8YC 3IRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=721Z7SDczS3OH3C/rA5M8KAJUQ4zq1fQLbBIK7DPEPI=; b=KfPAiD3A622NvexMIrWC1DH4vaH4OIzWuuvyrML23xz+2lnrpNnT6WhCiAqJVZrjDJ Wv97ss7U+VPD0w48yp844MRM4C0xFmainsSlJkeiETJ4/s26XnbPawJqL8Es8P0xQ+7Z W3lV/YtZGLUhNj9EZ14KFtOtcu9Z4v3lhGl8+Wb+UT0DGuoK4FZh77/GSg+r5PNOZ1E9 XJsUBxL9XRjVbQyRinNBprnk0SgIDlBjvP0xWFa6HDCnEnHQSIaf48GWsUK8oOhe5QnG mAQEp9z7HhasKYWz+TSwdqoG3oJIJZ47SrdY3fRwF+UfSR3YAIE88mte3MvgJzvBcGnK eZtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=c4rvo83j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u15-20020aa7d88f000000b004fc995b3385si17772144edq.634.2023.03.23.05.41.38; Thu, 23 Mar 2023 05:42:02 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=c4rvo83j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231849AbjCWMgm (ORCPT + 99 others); Thu, 23 Mar 2023 08:36:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231599AbjCWMgi (ORCPT ); Thu, 23 Mar 2023 08:36:38 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 277DC26C15; Thu, 23 Mar 2023 05:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679574984; x=1711110984; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r+ztcOnn0m/uP+HZ0+0cEy+nf6BiVCkiWkOotsDK89M=; b=c4rvo83jhJ2nLQrSFnjHUHfdytcNbPKzN+60XOeC4QdOZ//LKMBE109/ K9YWWal5oWizE74v6jjf9us71lofeENL13gOMmUsRibdAbAHwfo6C8OpK 2UY3VUi3qMkj5hk1b2dYPUfSuIxEC7y6JYK+MT/nbT1N7enGNlRe9rhVn 8S2p2LT76zSzbS70IbJWVBJSl5cduKwuTIoxpzuomdqnOaoOUzN9ATPz0 kANW5cnyt4A2SaP1im7c70+Cz3aHdnVbSh0EOzdaIv33wwbOOOz8inqnS R3savMneYomRoxUCWnTn+H2b0B3fO6ixz6c8GrhnN3zaJW6vL6clR3qd1 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="341011527" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="341011527" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 05:36:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="856466573" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="856466573" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 23 Mar 2023 05:36:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 35871250; Thu, 23 Mar 2023 14:37:07 +0200 (EET) From: Andy Shevchenko To: Kees Cook , Greg Kroah-Hartman , Andy Shevchenko , Cezary Rojewski , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Theodore Ts'o" , Jan Kara , Andy Shevchenko , "Rafael J. Wysocki" Subject: [PATCH v2 2/3] lib/string_helpers: Change returned value of the strreplace() Date: Thu, 23 Mar 2023 14:37:03 +0200 Message-Id: <20230323123704.37983-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> References: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761162373435680941?= X-GMAIL-MSGID: =?utf-8?q?1761162373435680941?= It's more useful to return the pointer to the string itself with strreplace(), so it may be used like attr->name = strreplace(name, '/', '_'); While at it, amend the kernel documentation. Signed-off-by: Andy Shevchenko --- include/linux/string.h | 2 +- lib/string_helpers.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/linux/string.h b/include/linux/string.h index a7bff7ed3cb0..cb0c24ce0826 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -169,7 +169,7 @@ static inline void memcpy_flushcache(void *dst, const void *src, size_t cnt) #endif void *memchr_inv(const void *s, int c, size_t n); -char *strreplace(char *s, char old, char new); +char *strreplace(char *str, char old, char new); extern void kfree_const(const void *x); diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 230020a2e076..d3b1dd718daf 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -979,18 +979,22 @@ EXPORT_SYMBOL(__sysfs_match_string); /** * strreplace - Replace all occurrences of character in string. - * @s: The string to operate on. + * @str: The string to operate on. * @old: The character being replaced. * @new: The character @old is replaced with. * - * Returns pointer to the nul byte at the end of @s. + * Replaces the each @old character with a @new one in the given string @str. + * + * Return: pointer to the string @str itself. */ -char *strreplace(char *s, char old, char new) +char *strreplace(char *str, char old, char new) { + char *s = str; + for (; *s; ++s) if (*s == old) *s = new; - return s; + return str; } EXPORT_SYMBOL(strreplace); From patchwork Thu Mar 23 12:37:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 74051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2884592wrt; Thu, 23 Mar 2023 05:37:46 -0700 (PDT) X-Google-Smtp-Source: AK7set8bvHhbEqoGaxnHTCzLxcsPXcTPO4B1ngaLUe178/pjhm0eZvrKC5kb6Uk+7bsGaqc8wRrF X-Received: by 2002:aa7:c152:0:b0:4fb:1fa8:da25 with SMTP id r18-20020aa7c152000000b004fb1fa8da25mr9225773edp.36.1679575065856; Thu, 23 Mar 2023 05:37:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679575065; cv=none; d=google.com; s=arc-20160816; b=WOOfOklDqM5RQllJOo88rizCzhI65RKphUBAmKZhVCOWKcpL1z2mBYk5XUy4Mekacm AloWXfFIMDZ1eSGE/0XEec5kdcQfNs8FdUOHuk9qGard4pfXUenk7F192IptSE+AujH0 aIn48wtHhJ+1kIfb0CeCyAhN/JEINkMV5TQssCkGnvt+BQlYGCm6bGz1r3g2Aq3KAMzR +9/cgXbb1aZoxuJMalfMU1jlmIcRlEPMjvpFXiyCRiiGnDgBvrrVE2ZsmYQPcvZv6ZGu 8SHlnh97fPlVJtjn3RPiRTavvHCHatCtsM7WnoCqADya3jRirkKdiI60DSC3Rf3SfcVa fpag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dyRJChjL9Vc/5oc5t+l1x2RE1uTtdGFuiDanwyKmj2s=; b=wkV3kH3zaDkRelUfF3j7aa/g+JK/eg+y22Ycr6jtfFKzqCHfwlD0XBKvkX+7gxuygu wDtMXPYnJ/EwXBJboNOgdPoMDIHtTxqmHlMNVoEFwTX2NQXYQlsptlRHYpP5tjqGW7yn PATSHI7QVZW07JaKm3RNDtJDwqmhZFwWbvQPoQD/nMx5BVvfqdS6tCByqGkHHb7bv7+n ftZa+u8aohAF9gDBx7y1Q2C2S0CkIx+bTGExnH3yiN+0x+JDX5LvrBJhtaYvfQZvB0wj 4fWDwMwEx67GD9SWPQntuBpO330nNOe8WYb66/kaG5URJbrklR2Ro5/x0h5uuHFhNxfP LawA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DVpEUyVc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u10-20020aa7d54a000000b00501d67d24dcsi6836851edr.414.2023.03.23.05.37.22; Thu, 23 Mar 2023 05:37:45 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DVpEUyVc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231776AbjCWMgj (ORCPT + 99 others); Thu, 23 Mar 2023 08:36:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231758AbjCWMgi (ORCPT ); Thu, 23 Mar 2023 08:36:38 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13B071B56F; Thu, 23 Mar 2023 05:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679574984; x=1711110984; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Uqba7KW+LSTrR6KDuN+F/tgiTmPx6AhRcJexGJYfzL0=; b=DVpEUyVcB9cuHQaevin9Hs+FrKfkjYEBilsuB7NZEcmJ68Q6q5r1gG31 aoUldmS7ijsb/RnEvdcQ/AGw8VWqYvT6mbmJ6cLoVQsk4OO66IizRsR+9 fn8AHZvaZmXMiEgWNtxCHFpi7wc7WMocpWf/Xj/0JxGQnz565QA0Mnj+P zrHZePsVE6HiBlKFLldJVcYA02CXlD85JCEo5fBX1YHKugzTDpCtEztlt 4Dlx6rJ5qYBKowjEn0nlMqB6bOFEQbUtxhFd/TaiD7InqMnD1Z5Gy7Vof +QYZaieWqldzU0n3Z5ZzMpOa9gz1waTZ3elG1kpxSQOv/AjfNMM09BSk6 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="404359764" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="404359764" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 05:36:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="675681050" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="675681050" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 23 Mar 2023 05:36:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3AE4C176; Thu, 23 Mar 2023 14:37:07 +0200 (EET) From: Andy Shevchenko To: Kees Cook , Greg Kroah-Hartman , Andy Shevchenko , Cezary Rojewski , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Theodore Ts'o" , Jan Kara , Andy Shevchenko , "Rafael J. Wysocki" Subject: [PATCH v2 3/3] kobject: Use return value of strreplace() Date: Thu, 23 Mar 2023 14:37:04 +0200 Message-Id: <20230323123704.37983-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> References: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761162104470878027?= X-GMAIL-MSGID: =?utf-8?q?1761162104470878027?= Since strreplace() returns the pointer to the string itself, we may use it directly in the code. Signed-off-by: Andy Shevchenko --- lib/kobject.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/kobject.c b/lib/kobject.c index f79a434e1231..16d530f9c174 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -281,8 +281,7 @@ int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, kfree_const(s); if (!t) return -ENOMEM; - strreplace(t, '/', '!'); - s = t; + s = strreplace(t, '/', '!'); } kfree_const(kobj->name); kobj->name = s;