From patchwork Mon Jun 5 17:05:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 103403 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2839189vqr; Mon, 5 Jun 2023 10:21:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4lEt9dNRzl+q25sl1EqanP+3uYW09elL8SnIkk4Jcwa/A7B3seIU4T613xAJFPDOQfIWBS X-Received: by 2002:a17:903:234b:b0:1ac:b449:352d with SMTP id c11-20020a170903234b00b001acb449352dmr10090790plh.61.1685985677751; Mon, 05 Jun 2023 10:21:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685985677; cv=none; d=google.com; s=arc-20160816; b=ze+VPJ/CnPbT/vbKel+kc75Va1eD6vL9hxpi8LkxXb7ZSdkYKEtMuxy26Ef/eiPowC /mtNhMF/QDkzEaO8yfsTTQhyQGHc4dgjA8VKdzasiL18RUqbUYF9YBs7AaattOyeidZp 13/3oOcV8vBQM2pWG0Ov5547AL1txBqmsN6kQYa6RJtiEQiF7Qzhd64bjcXphIlyfqv8 ViPs9K7423Y6P3KAnyozBJ8q7lC0A0NhLfT+hbvLSie+vn6c1syo/W/2xsfqr3L+3rhH PyKk04Q+vPC9jlt5ihNWfz4JIZvF2j7UvNSCtAhdVE4MOAm6QfS4084gsql+slwtgbev 5zJQ== 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=X9NL69rWqHaMcTkk1q0OJqCDhrn2wmcLoHK+4ZFta4s=; b=BU4k8+kJntbni6cCIfaA4yaAfoB4vYNmeJnFJw87An2Qs12oGDIxuy3URPR7CQZn4z 0lXGhg5a/gVfdJjzg7nUVkFlYf8GxxtIQkMTW0Z+iiwPF9AVlsU/RGsKoV/Ep3IxDJD0 dkh67Wi+qkHAp0FBmfjlMr6HajIi2p3MpTNWODBoT1gIiU/X0Hz17NfC/h0Ik4jg3Jiq aoTW/J8RD+6J+Eg+KBl+AdvQ+C7r50vIL9BVMhzwRnTGHlPttnnrMwjpH8WT7B2wZvYZ y5CkJykTqTQdzK3MQ4K4lwfzq4ThmDOqzOgFxz0mScDbGpC5duUAWTOsEfNDphUEZBsO CcJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fLlLmNLk; 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 b2-20020a170902d50200b001b07c3c31f1si5891321plg.267.2023.06.05.10.21.05; Mon, 05 Jun 2023 10:21:17 -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=fLlLmNLk; 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 S235291AbjFERGO (ORCPT + 99 others); Mon, 5 Jun 2023 13:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235187AbjFERGB (ORCPT ); Mon, 5 Jun 2023 13:06:01 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 515FDED; Mon, 5 Jun 2023 10:06:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685984760; x=1717520760; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KBLjfFtbsCdNjxRprw9OiUI+007+Q0Bv6edzE8t+Abo=; b=fLlLmNLk7EN2fFWVHDienboKYrMJTdfYjtWSnZW81E3ulMkfI/1ldwdU TTuZ5+cADGB7YgIPt6DoRtQV+vHDew6Y1xbYhM4YA709JHONoiNVKIYva hBMZDtgjKx2+ANcFZFjot6biQxwz5F41tAdiQKFNUWUichxnfkWCcLcJN 0uxj/BKh/IkjcZ7kAQgkPwJI6rFPS3ZEeGHfglAhaw3m4psLIWyebc2gA YpC030bVDDBHsfaC3h/1LeL0VGCwVZ+W/N86p5kPWq8lNb+w+rlRAOf4c sSQKc3MxRT1/ntgpdjcVl5OviCBlzT+h3h5ihTa3eBWBOR7dTIqvnaSxu g==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="356431401" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="356431401" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 10:05:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="773807508" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="773807508" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 05 Jun 2023 10:05:50 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 93C65FD; Mon, 5 Jun 2023 20:05:56 +0300 (EEST) 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 v3 1/3] jbd2: Avoid printing outside the boundary of the buffer Date: Mon, 5 Jun 2023 20:05:51 +0300 Message-Id: <20230605170553.7835-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> References: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767884117760901152?= X-GMAIL-MSGID: =?utf-8?q?1767884117760901152?= 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". Reviewed-by: Jan Kara Signed-off-by: Andy Shevchenko --- 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 Mon Jun 5 17:05:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 103406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2844293vqr; Mon, 5 Jun 2023 10:30:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6+daliFz6mtb7EsGX6J0wntkSaUE7Bega4mne1beeov7Mu4rZCEtKiKrdHO2cXK00y/F8v X-Received: by 2002:a17:902:d4c1:b0:1b1:99c9:8cfa with SMTP id o1-20020a170902d4c100b001b199c98cfamr10073843plg.14.1685986233714; Mon, 05 Jun 2023 10:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685986233; cv=none; d=google.com; s=arc-20160816; b=CvehtVBpWapU4MPYpCr5i0/P+Au06/0FA1oN9vMYbZpW0LcsXCjeuBd4tyz9EQrZZB LpcGKrq2FoJSoQ1yu4GiPIZoPdiQ54eMNmW97wKQ3b71UVIMeDrFfLue8VlMGDDZdogO GLktkmOSl2TI4/QIxm7tUjmgK8TM2kRHQKI8uvZw6gtovDmikQkhwpGzpD6KtrQHtUIk 2O1t3No8JhKEFVHJeBS491ZDDPyRvWbg4JWC0RgFfTgNviLi+OfZP03sSgD9yvALW2f3 ybah5CsC+pxfHDchdNXw+RP1xcu3ryEaJpsJyjIPfPmlFdZEe2ITcQ8oxoV/3c4vW7uT bHAw== 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=uA/m6loapBmg/hYCoNoaikfwS499+6QxlbaIPWc4GqQ=; b=xTUcjMowvC2bEPIUA/poVfV/AZujut8x2sodXIiTVOgW1QFD2FPhwmVZOiWIZK0E1z Rok0YZPnjUjs919hzl+GWF/B6rCc6af5EFL8aOX04D0oJ/DLnEtHSpFT5I3DX6Nza87h /olF+FjHlHHTEZjuig0i9OYYuzwtGwhAtCU8lpCg+JdS6TkWOdpYq0ConAOZbSdHtm9x YxHKT0wbVkFZhftqe7LkXcoEfmwFl90GJWE7eBrNyjKgjWXdVjcUS1WQ1sv/+ade9AAy ZOG54zMtT/cdL6WdZutW1sVZ/j/lHX/+hJhULkyQbK9UPhT/3kI/kPgmh4+Sq7v5ktSi JWIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WWqlzGxd; 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 u8-20020a170902b28800b001a92f0f46fbsi5655017plr.436.2023.06.05.10.30.20; Mon, 05 Jun 2023 10:30: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=WWqlzGxd; 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 S235263AbjFERGH (ORCPT + 99 others); Mon, 5 Jun 2023 13:06:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235107AbjFERGA (ORCPT ); Mon, 5 Jun 2023 13:06:00 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 615D09C; Mon, 5 Jun 2023 10:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685984758; x=1717520758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gFiVCBXWyj8bmgbMxtEqGr730r7w2iTq5mksoPWBe7A=; b=WWqlzGxd7lWQv+bSr1iQeZlDLji0adz9uhaWwby8h4ZqhsyW1TQQ1SLr v+loH2puNZ2ZiG4ZLui0gxAV2WCYy/WsMlqzHCNk+w11pyT81LQsTNst/ xm+R5YKJb3ymTsQiK0wNNkIM0AeeEkcG+J58QXGwKPCuFhJpEawsoZ0M8 2oMxVuxLNUn0LC+xKBTzG0b2/Q0HUgaBlZAKjUhhYFCY5sT7GWSBXKXXS m8m+pvdjbgvpTpdtOLal8+esIG0+cyYlW3nvWijSYl6L7oZJU0ADm8UaC BV3RU3l+uBOzvKC/gHDNvTAMdmCQ5aNXe5q3UZQXkwgGMC009ATtqlN1A A==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="356431386" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="356431386" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 10:05:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="773807503" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="773807503" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 05 Jun 2023 10:05:49 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9E28B34F; Mon, 5 Jun 2023 20:05:56 +0300 (EEST) 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 v3 2/3] lib/string_helpers: Change returned value of the strreplace() Date: Mon, 5 Jun 2023 20:05:52 +0300 Message-Id: <20230605170553.7835-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> References: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767884700778361188?= X-GMAIL-MSGID: =?utf-8?q?1767884700778361188?= 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 c062c581a98b..dbfc66400050 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 Mon Jun 5 17:05:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 103404 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2839679vqr; Mon, 5 Jun 2023 10:22:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QzL5VABj9D4rvUtxPBKyfYTcUle3O146AuNnLvYV5NRa05T7ziA3ItN9eM6JVnbFooirv X-Received: by 2002:a17:902:cccb:b0:1a9:3b64:3747 with SMTP id z11-20020a170902cccb00b001a93b643747mr4930808ple.17.1685985726264; Mon, 05 Jun 2023 10:22:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685985726; cv=none; d=google.com; s=arc-20160816; b=TOlq4+1mjiYNiNANYcScCNVpSmlLffvyPg7vTK0XzYjGvoKjnhpImfSXDckKW6ZIQ7 /7Tz+4lPQnnzsbLJcr1ZbIsuA8RjsaCWYn6angNofoPiTBZ+kA+tBZzEinFG6HQZZ/GT 0Z821jHB5nqFI91So+m6uMcinu/G3M51r8rWP4vuo/ZtXjq+UrNWQJmlhGl2FWWm0Ia0 7msfAfHOubUq4GNDo+zYLWLzEubJD5f5/RTzIdopGw8dF0toPUOOZwVRxqNvu9JZeJRJ kZUh9n6SBG4CZlfSnBU5He0KlJ1vzsPCVwamhql2pbWxTKIcZii4lwZXqVUVZxeQSU8K UFwA== 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=eFsh5o2NRXTbZjIFW8MXfRUQR0w+TMWcVS1n2PPqvMTB93Cp0lqOIj9/yqN7mIsYd5 HidCtNov6k6ExjG39w+O2n6dNt5xIW/g4c/OrWC0ChW1V8b18p+uAGr4D40toHYBtdF2 woiyylC7DjuqUoh/eEVWe9pJfkv+QkXRGuHq7ZQb9pTdsDp+SRXvL664W6XxCkwhNLm7 LbE3S2SSlGETlfhRKzI2e+uWNabnf0ks6gajEcxrMnGJzCYLHle0VjuISe/BQ0QIEdH6 OhQb3CAyL4DZafFRnZ7luzGa5nTXSAdgSaCzmIFztXkPwg/ukNjFTCd9fi8O7U+YzzYH 534Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gZnt7i7S; 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 h7-20020a170902680700b001a69d1be184si5590878plk.506.2023.06.05.10.21.53; Mon, 05 Jun 2023 10:22:06 -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=gZnt7i7S; 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 S235182AbjFERGA (ORCPT + 99 others); Mon, 5 Jun 2023 13:06:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232289AbjFERF6 (ORCPT ); Mon, 5 Jun 2023 13:05:58 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90D9EF1; Mon, 5 Jun 2023 10:05:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685984753; x=1717520753; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Uqba7KW+LSTrR6KDuN+F/tgiTmPx6AhRcJexGJYfzL0=; b=gZnt7i7S5RAKnCKhWoOseINM9UweFOim683+c0tM4l+IvhnrTiEsvNsw JAbAU1C6zGh/Jgx/2ys2TRPKu32shLHlX47KJdo9lEMBGzeqdPFOutF6E sXVfRKyebWO6uAl1SSnvYo2BJLsEGI2CyZNgM23CdLIWozuWyhe7pHjfY l9Nxg6UnQShrJF8Q7HpHEZB+EtoN5++Oz4mwgOXik1k7dVyxUHOZIqEDC eU/oQPvR4mY32FA+j5qW6AJJtHJwXa5CPKCnY9K/cT2jPhSqrirF88/rR s3YfBWRqAuPdYQ4yjKUwKZbtbhqMVxwOqK5YTIKOdCtUO9LfCAyauBLRi Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="356431378" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="356431378" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 10:05:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="773807505" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="773807505" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 05 Jun 2023 10:05:49 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id AE297379; Mon, 5 Jun 2023 20:05:56 +0300 (EEST) 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 v3 3/3] kobject: Use return value of strreplace() Date: Mon, 5 Jun 2023 20:05:53 +0300 Message-Id: <20230605170553.7835-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> References: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767884168982763132?= X-GMAIL-MSGID: =?utf-8?q?1767884168982763132?= 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;