Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp928324rwb; Thu, 18 Aug 2022 15:06:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR5fV90oga7Jif2x2ksGaO/uSrBAiZf1/c4msSE524SOj9+7Wfpk+awhRuIOfey9sAaD+Ai3 X-Received: by 2002:a17:903:2286:b0:16f:8f52:c952 with SMTP id b6-20020a170903228600b0016f8f52c952mr4453570plh.126.1660860396342; Thu, 18 Aug 2022 15:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660860396; cv=none; d=google.com; s=arc-20160816; b=SIrc0bBiP+Wjh5FwSI9LPtJWyF2b+81Bwqcdejz3HZ0SvG2HGf96b1aA+qxnuH2uqt lrijsSINocbnU+yRr8R0KAIRs4g0igjScaMsCMlDZ5iHQDSnK1tv8+mVZ2N+EhEOrmcn x1tKqvFjVG4pOKKJAWN9KivGSX+NEAi6gcDuw7+yq+Y2JD9/LRVSMld1SllKXsHVj5qX iTnNH2AxKGKvEoJTXpczFDbfQw4Dg+dINL/YovSr1BV3Z17kDjhAf+X1UUUkJryCRzSN HAuAUGtEa4Pq4LJmapmHekl6wmd8o+f/vhTNDi3mEZBaXHE6vfhtEnI3ppdh5xJ0lOF0 mrMQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=85y/92N89aIPAPJqh85Y2ou8exHl+yPr6l1uRRzXaIs=; b=Pbyb+BGPTnL2T1Rgg6Wfp4kMC+KFG0yi7ayIMFVuk3yKoRtilTp7HP1PdaEvZ5X139 JmodgZBF02QGxIDIDHSkKckH0ZxFvWHcArc7FhSJApKUDISV/hDz0zDNG9op69CyVxvM IZk5/Weo+mGp6sP0+P/AF9aX5jwCD32xMkFCpzJhC6L7GlnvurS58oOnCKY1japsEqXi tGqHrCvPtChipdsguJ7Hs96Q/wV91+h5E63pR0Pox/Ajf9B9K5bZX02o+hTtNYPiojzy U1SV+UoOJaf+ZA4jgQUF+iLJ7zejk5AJRCAVUQ2pccvhlJymqbkJbGxiaXl7dJQf+bgc A79Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b="RN7z5/75"; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d2-20020a17090a8d8200b001fac102fdeesi2143203pjo.95.2022.08.18.15.06.24; Thu, 18 Aug 2022 15:06:36 -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=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b="RN7z5/75"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346694AbiHRVNK (ORCPT + 99 others); Thu, 18 Aug 2022 17:13:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346802AbiHRVKc (ORCPT ); Thu, 18 Aug 2022 17:10:32 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFB1ED8E35 for ; Thu, 18 Aug 2022 14:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=k1; bh=Pu930IAe/AYCg8Oap5bmCJ32MkT AAiu9pRH3YePSC4E=; b=RN7z5/75Ie/+RG/Uj4zpOfHWaZltdHhdnjx53b60RHh R0rjwBFAShGPJcUbURxwYUamgmYbnymY2BzsJ0FAvP20KDq336J5etnpCMAd54hG ZEzZVsHe82UB45xh80eBlVYEWLySnXM0JK12rQHdnDxubdZnSHD9cdWEJlBQvKi0 = Received: (qmail 3962995 invoked from network); 18 Aug 2022 23:02:13 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 18 Aug 2022 23:02:13 +0200 X-UD-Smtp-Session: l3s3148p1@JXWsS4rmHKYucref From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Wolfram Sang , Roopa Prabhu , Nikolay Aleksandrov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , bridge@lists.linux-foundation.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Subject: [PATCH] bridge: move from strlcpy with unused retval to strscpy Date: Thu, 18 Aug 2022 23:02:12 +0200 Message-Id: <20220818210212.8347-1-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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 Follow the advice of the below link and prefer 'strscpy' in this subsystem. Conversion is 1:1 because the return value is not used. Generated by a coccinelle script. Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/ Signed-off-by: Wolfram Sang --- net/bridge/br_device.c | 8 ++++---- net/bridge/br_sysfs_if.c | 4 ++-- net/bridge/netfilter/ebtables.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 58a4f70e01e3..b82906fc999a 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -251,10 +251,10 @@ static int br_set_mac_address(struct net_device *dev, void *p) static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strlcpy(info->driver, "bridge", sizeof(info->driver)); - strlcpy(info->version, BR_VERSION, sizeof(info->version)); - strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); - strlcpy(info->bus_info, "N/A", sizeof(info->bus_info)); + strscpy(info->driver, "bridge", sizeof(info->driver)); + strscpy(info->version, BR_VERSION, sizeof(info->version)); + strscpy(info->fw_version, "N/A", sizeof(info->fw_version)); + strscpy(info->bus_info, "N/A", sizeof(info->bus_info)); } static int br_get_link_ksettings(struct net_device *dev, diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 07fa76080512..74fdd8105dca 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -384,7 +384,7 @@ int br_sysfs_addif(struct net_bridge_port *p) return err; } - strlcpy(p->sysfs_name, p->dev->name, IFNAMSIZ); + strscpy(p->sysfs_name, p->dev->name, IFNAMSIZ); return sysfs_create_link(br->ifobj, &p->kobj, p->sysfs_name); } @@ -406,7 +406,7 @@ int br_sysfs_renameif(struct net_bridge_port *p) netdev_notice(br->dev, "unable to rename link %s to %s", p->sysfs_name, p->dev->name); else - strlcpy(p->sysfs_name, p->dev->name, IFNAMSIZ); + strscpy(p->sysfs_name, p->dev->name, IFNAMSIZ); return err; } diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index f2dbefb61ce8..3c3ecd4cddb5 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1446,7 +1446,7 @@ static inline int ebt_obj_to_user(char __user *um, const char *_name, /* ebtables expects 31 bytes long names but xt_match names are 29 bytes * long. Copy 29 bytes and fill remaining bytes with zeroes. */ - strlcpy(name, _name, sizeof(name)); + strscpy(name, _name, sizeof(name)); if (copy_to_user(um, name, EBT_EXTENSION_MAXNAMELEN) || put_user(revision, (u8 __user *)(um + EBT_EXTENSION_MAXNAMELEN)) || put_user(datasize, (int __user *)(um + EBT_EXTENSION_MAXNAMELEN + 1)) || -- 2.35.1