From patchwork Wed Feb 8 13:31: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: 54429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3457610wrn; Wed, 8 Feb 2023 05:34:19 -0800 (PST) X-Google-Smtp-Source: AK7set92tEkkEZsBgVMLyP4qKYqQu1t9mOgWtfsVIDZ6x36om+gDNNcOYyF3HgxR6fa8f4YPb8S4 X-Received: by 2002:a17:906:7484:b0:8aa:c0d5:25b1 with SMTP id e4-20020a170906748400b008aac0d525b1mr3595043ejl.5.1675863259064; Wed, 08 Feb 2023 05:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675863259; cv=none; d=google.com; s=arc-20160816; b=anoYub4XpNvcYDk2lFgykc35RA/Sci11b3abyumMETz+4huubbw0sn2jkCbbawylTT xk1qkxO0piZ5wovBjhYyaiZniaV7trJ51cTP2TvKmrDYPw2I0jmB6zqbXgcxZIBDv6sd voHlxdbPyI1xN64rpYprJsWDwaRCwLIWqkkNsAPD3mKHdsPjRSjn3iBsVRH+3LWebvRq 2tJ4Vj5gWPYZyqYvo9Id9O/JfdrUM2a9cahPKohshGIt+ueJBfCIP/stYBLz02Dsd4XU fl1VBPBZOEoNnqUM/BW2H7eYO5BkL/032YcYuIIbyjsi/g2Q1XvZeROYBg716PKbo5DS L8Vw== 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=TaAJIjUuEOxizG1OQCP18MDSYJ1yERo78awGxfXu1rw=; b=NyNreRyHMtopN+HG3RUIsHLsfsPIpac8trm/T1KDyg91oSTDzL35jDzfLzPd5vKhNh LCebMuOs0Ol4n9i+jfwFDXYHopK47Y1jJ4vUl9b+sTy7sXgtiPlxtmJTHa+K4uBH3F6B U+4X3VAk+vexrLCj+WRzg5RdV9q/0wZ/39c8IxcH/Sw7vMqIHwyEQbYYQorhtWU4Zymf 17iptk3oO1BKBQ0LnyNFkislSWr5kv5hS1PsbHG0FqgeDeZK6AC9Kgb68r5cbSBtw1xS /c69hw8jHqA70PxBP1bi2lVOooNRXveAH0bd7uZzLYQxUsu7Jvy052EcugPCWSqSEv+r sklA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j8CS3nR3; 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 uk28-20020a170907ca1c00b00887cdc2699fsi19636776ejc.544.2023.02.08.05.33.56; Wed, 08 Feb 2023 05:34:19 -0800 (PST) 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=j8CS3nR3; 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 S230480AbjBHNbq (ORCPT + 99 others); Wed, 8 Feb 2023 08:31:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230010AbjBHNbj (ORCPT ); Wed, 8 Feb 2023 08:31:39 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1E4247EFB; Wed, 8 Feb 2023 05:31:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675863098; x=1707399098; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EQiB8u8MT9RmdXrZcW6jRKDu65zFVwKhnZXefFKcEvo=; b=j8CS3nR3fOCXtseyIhe/YFbsZVbY4uitXi3WX29ZAMVyiEvY6Uz5IdI4 +g8eO97Ax/niSD/D0tluV4I6ncMbYvxoOFlx/ESXfqCBvsdgGPNXac2dE 8gO1lnFZX/RuDGrwt0XkQV0WI4lb0nG6NyBnFjo3J4ZYx04ODxXO7K49Z oU+Q0Vc1+BzsM1b0JhWu7zjhiWYPzaAGd47O9wVPKbbefAG6eTqtWm7Ml RQ8XmJbJQt/Cr9OpZrz5ZlQ4YIuoVYmfwjdLYR+Bh30aPKsheAm7u7kBG T+XYX1WtQm46/PlAAncIPlbBmj7VYAIXz7nCB43iFWO7i2E35AG/BlcCU w==; X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="416017505" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="416017505" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 05:31:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="617215419" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="617215419" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 08 Feb 2023 05:31:21 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 40FEA210; Wed, 8 Feb 2023 15:32:00 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Jakub Kicinski , Xin Long , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, dev@openvswitch.org, tipc-discussion@lists.sourceforge.net Cc: "David S. Miller" , Eric Dumazet , Paolo Abeni , Pravin B Shelar , Jon Maloy , Ying Xue , Simon Horman Subject: [PATCH net-next v3 2/3] genetlink: Use string_is_terminated() helper Date: Wed, 8 Feb 2023 15:31:52 +0200 Message-Id: <20230208133153.22528-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208133153.22528-1-andriy.shevchenko@linux.intel.com> References: <20230208133153.22528-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 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?1757269992653207950?= X-GMAIL-MSGID: =?utf-8?q?1757269992653207950?= Use string_is_terminated() helper instead of cpecific memchr() call. This shows better the intention of the call. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Horman Reviewed-by: Jiri Pirko --- v3: renamed to string_is_terminated (Jakub) v2: added tag and updated subject (Simon) net/netlink/genetlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 600993c80050..04c4036bf406 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -457,7 +457,7 @@ static int genl_validate_assign_mc_groups(struct genl_family *family) if (WARN_ON(grp->name[0] == '\0')) return -EINVAL; - if (WARN_ON(memchr(grp->name, '\0', GENL_NAMSIZ) == NULL)) + if (WARN_ON(!string_is_terminated(grp->name, GENL_NAMSIZ))) return -EINVAL; }