Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Kang Wenlin <wenlin.kang@windriver.com>
To:     jmaloy@redhat.com, ying.xue@windriver.com, davem@davemloft.net,
        kuba@kernel.org
Cc:     netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
Subject: [PATCH] tipc: fix -Wstringop-truncation warnings
Date:   Thu, 12 Nov 2020 17:34:42 +0800
Message-Id: <20201112093442.8132-1-wenlin.kang@windriver.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from pek-wkang-d1.wrs.com (60.247.85.82) by HK0PR01CA0064.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Thu, 12 Nov 2020 09:26:24 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 0ccc6fdb-e038-476b-49c0-08d886ed07e5
X-MS-TrafficTypeDiagnostic: BN7PR11MB2722:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BN7PR11MB2722F5BA6114BD22803D946FE1E70@BN7PR11MB2722.namprd11.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:4125;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: suN/OSmrq1rFALcLExQ6fjdl8bi8E5mImNknFbTC9OVWihiP3Sz4mW9YmfBvmLkViuDYEM9KIMX/eM4qxGElT9vBcQyROHlikZZkyNfUw6hwdqfJfPBnot5Qv5JISHC6l1T/kyEdas/DUD8cWGZ6OtkkOzRl3Q22JA+z8CDCB/9tzo/2vJueljOPoc1lU1plVLMU/rrLNDB9RDjJrghWfnw9Ii++426Y/K5y8FO1f/o9s+iYfQj07xOikqZmbmyLsRii6TfSikQf4ixrXX867yGWY9fjorsMbky5O97B+01ScYHfpMDtDPjqJKzwLu81uCDujRffNUS9ADQdqMBwnw==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN7PR11MB2658.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(376002)(39850400004)(136003)(396003)(8936002)(8676002)(2906002)(86362001)(1076003)(36756003)(16526019)(4326008)(6666004)(478600001)(6486002)(6512007)(66476007)(316002)(66556008)(26005)(186003)(5660300002)(2616005)(52116002)(956004)(66946007)(6506007)(83380400001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: ZWvcTZDqQPIRHR8p1r9DsTYik3psr+mjUB7zY72QCDcJtTqOpnzCrlttD1Rfl2lmmSmJjmvnp660XDbUCeAGsQg75qN7mmfhhdbeQNFDPDl2A9kKd17LKOQeAgl9stL2br6aigcdBCaYadd+VO7a1+2I/AgAyC2HiaTrewjfH77duI5hUUoc0U24De+SEz8fe7yK4Crd1oSCjflXeR/IP/GCAGZBznvJIw8d82WGlNw2A1PMHoPivoB8PNP0OwawruiUiA9ug6MNPQ/ZSORlZJDdbMSSz6MQ36CyBfo9pkCHqylTdS7PMdiFDYXmUhjpM2SX89xyoxZST/oO8thxWPd4+/8b9RMC0YOGhxbJQmZB3s4tvAUAFntTpF1zqrlLuB9JIvDOJIHGJYzMX9Jk1TPaaeIlQVUty2gCwpSAPq+N5gO043F5S/7wY9snUQUUEsxNsu/IJ2CZoVu6YK14LbwMCJu1dMRK32MqWn/Fie04hSYqfxXkQ/UAdg/tHMiCv/bNGlN4BKL91O4WUN0LQixZsevfMwUXKjWj85oZh8ynHSOpr+WADIriSDXM++Qg8bR037+Ej914YNbSCbgcenvDVqvP5OedDeceuD73cflvaBIaTJRNCGCt9HEdsgUF362l/kvaPf20dvUPUdDgKsCTms5HQRtBhio+NSjpFeRHQAFu6TFrOkclGcTLSaQHtW/oCGLSmsZTz2akLbpAD9W40nsfW0snR2WPR3JzmDmhVzGQtUj5ZoDnKhARwTz2MbUm7K4ms4t5VNIJqRlN3XwYzhq6hq76yA3SpCOZceTKfL8tZLSnr9qa+gMHZ8CY4TIJy4wZa038IiLqYxI9NgSNtUSs8wEzFod17D+wjozWr6OjB0KsRwVzusFxzHCyqUyAwbPRtgBk5tzF10uYsg==
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ccc6fdb-e038-476b-49c0-08d886ed07e5
X-MS-Exchange-CrossTenant-AuthSource: BN7PR11MB2658.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2020 09:26:27.5150
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XOOXqLWfVLilHfidzb2JOql3c0VgGfJVvDzl4RTx9L1fF1eRgUt5V3tMCkCwLgFzpcCYhT9v+Fv3mnGf7ELq1wVftGcxLRjhzm2JEWXB9xM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR11MB2722
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wenlin Kang <wenlin.kang@windriver.com>

Replace strncpy() with strscpy(), fixes the following warning:

In function 'bearer_name_validate',
    inlined from 'tipc_enable_bearer' at net/tipc/bearer.c:246:7:
net/tipc/bearer.c:141:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
  strncpy(name_copy, name, TIPC_MAX_BEARER_NAME);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
---
 net/tipc/bearer.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 650414110452..2241d5a38f7b 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -139,10 +139,7 @@ static int bearer_name_validate(const char *name,
 	u32 if_len;
 
 	/* copy bearer name & ensure length is OK */
-	name_copy[TIPC_MAX_BEARER_NAME - 1] = 0;
-	/* need above in case non-Posix strncpy() doesn't pad with nulls */
-	strncpy(name_copy, name, TIPC_MAX_BEARER_NAME);
-	if (name_copy[TIPC_MAX_BEARER_NAME - 1] != 0)
+	if (strscpy(name_copy, name, TIPC_MAX_BEARER_NAME) < 0)
 		return 0;
 
 	/* ensure all component parts of bearer name are present */
-- 
2.17.1