From patchwork Wed Mar 22 14:12:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 73452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2368125wrt; Wed, 22 Mar 2023 07:20:54 -0700 (PDT) X-Google-Smtp-Source: AK7set95nwXEnJ7csnwbJaFE3WEBo/j+QMMPrwxoVy1emfGuTYLYdTIWxjA2XgJqSU7TSoMqCiT/ X-Received: by 2002:a17:902:e751:b0:1a1:c98d:179b with SMTP id p17-20020a170902e75100b001a1c98d179bmr3440281plf.60.1679494854279; Wed, 22 Mar 2023 07:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679494854; cv=none; d=google.com; s=arc-20160816; b=JcZKCXWphj/MhhJF4NATjcb5rJdgQslf3XhO7Kwa5/KZ/VOeaOYbSH7+dWEPQ+9FYP BbNQoS93dI2fA4EgV+AlIfL1LfRbKCRsuoZyhq09+008Fsbuy6bIBoU6lptfgYcWUdeF HyrXHVlDG+umT/WcTkcxaX8ctzmbgLxis6IyUKSCY17OZyF0sZZ1yj6gkUF3NEJCZ5ua UV+lV3p/Xbeh0CxEffljOwr0ezgP2Qc3pEuy8HT21404HpU4Nn/LhSwYP47OPVb7Qw0a sGbXUhBDNRwMsbERw7G2WjfWuJeUhA8KXism0Q/ecl3eO1V/lLHzkHZGdKjhjl3+0VwR G/UQ== 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=F72P1f8U5LyTlpUM7NW62YLd9QilVR+bzqMPPG77K9w=; b=FND2BeuF/fOVcjdHbirJ7HL2A+covQuJkzZ8spRi96phztEyMnP81VvLKyHH0wXzRO t57JFptwFatYqOrXJC5gySwiQ8+9kcyxTUT3ue42SLHCeZtp6Bstlh2/+NSEg10bMcOg Gi9ecwCW7u3Frj1Y4i1FjCQjfptOhan8OIr5ezSqopAd5X+eB1Ihf7iWmfuewzziDx0q vXCjBQuu6XJ1kuQHIQR8F07qvO0zMs3JO5Xfj1p+XUR4d+fY9HdaRFSoKbskgAOp5moX KP8jxd3g7NjecSflod7w2vduVIK10BWCCa/R0RMAtHA6wbMvBJFVVqYyizt9tltZTIAW xm4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MXMWHxqP; 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 h22-20020a170902ac9600b001a1be543fd1si11243236plr.237.2023.03.22.07.20.41; Wed, 22 Mar 2023 07:20:54 -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=MXMWHxqP; 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 S229520AbjCVOMf (ORCPT + 99 others); Wed, 22 Mar 2023 10:12:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjCVOMc (ORCPT ); Wed, 22 Mar 2023 10:12:32 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24AA66484B; Wed, 22 Mar 2023 07:12:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679494339; x=1711030339; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=skh8+hJ3oe4RQZywlVKVS1TXtOKwAEOQhUA8WWOtK0g=; b=MXMWHxqPi4sBbyGZrjhnK7OYVgF7SZo/pdmBi5iIflo/a5rijL7cAZt7 q9JmqVVE1q4/QMwKHJAx+f8zJMw0brf/hCJgXX1TmIp5qb8KIHflwgoPp RNvOtD7G/gs8mAb9YoJEBveBbZxVVVHJYaJcOoynrk66oaX78ROUjwyzq JiYOtz8CWQJ5uqrA6dFZ+/y891viSDS3x4/o+8wW8LGQ8ddBWBp7QxiDd K2+Vl6Q4F6QduhcSBo4Cv+MkqFqtjZXecKeHj9CmQjZx759bJQmlKhxuR VxtpAJpi5/e3nXoUuPu9Yq4OZtGohuQaNMXeSKFNzmWxZGKi8FYsOlpYi g==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="319613611" X-IronPort-AV: E=Sophos;i="5.98,282,1673942400"; d="scan'208";a="319613611" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2023 07:12:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="805829396" X-IronPort-AV: E=Sophos;i="5.98,282,1673942400"; d="scan'208";a="805829396" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 22 Mar 2023 07:11:59 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 150091CC; Wed, 22 Mar 2023 16:12:46 +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 v1 3/3] kobject: Use return value of strreplace() Date: Wed, 22 Mar 2023 16:12:06 +0200 Message-Id: <20230322141206.56347-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230322141206.56347-1-andriy.shevchenko@linux.intel.com> References: <20230322141206.56347-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,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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?1761077996239040993?= X-GMAIL-MSGID: =?utf-8?q?1761077996239040993?= Since strreplace() returns the pointer to the original string, 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;