From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4DC0C10F00 for ; Thu, 21 Mar 2019 22:20:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9D3E2192B for ; Thu, 21 Mar 2019 22:20:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727440AbfCUWUE (ORCPT ); Thu, 21 Mar 2019 18:20:04 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:47052 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727425AbfCUWUD (ORCPT ); Thu, 21 Mar 2019 18:20:03 -0400 Received: by mail-pf1-f194.google.com with SMTP id 9so39532pfj.13 for ; Thu, 21 Mar 2019 15:20:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tOra8LoaPe9Tm4sF+UFKOWEbeNVcZyRPvrsR/8FvUbk=; b=JoD4al3t2zODxI7p+CGoNCsiAWxhGfYK4igz6w9PVM1tYVH3oOhzdN7qjAYgo2gyBf 5s0vmp0N/jgxQ4bk3ugxCFwiALQsKGkMpvNRGFN0US6ZEJQ4c3iQRZ9JU7PBA6QRKWPr 1UlJnHO+W4D5J0ORJ/Cy+UYxi4CEzASY+SWifL2UlQYGJqcq+wIYLV5eFIvHMU3QD47T m8yvSlMcmaMxwE6OxZhPBdwhRaiatGFzMFQCaalQm2j8hnyQfjf8IizTeJAlwtW2KyHV 2HBhLg4MqQ5f6ho0e38odgam10Su4WQJZ9CI1fePfCVs3smQJhE1Mb9qIsQMbZUKcZJb 2DWQ== X-Gm-Message-State: APjAAAW5OqOLQN/ZiYtg6GJaMBxaO7StWjSqbamKRvBOuUf0aRnBojEI CXPltgu56ockb3pBctw4id0= X-Google-Smtp-Source: APXvYqzG8CaUNFLm5+6u24dz7fjh3F3WTyWA9RfymsIXtuyS9ADGhoaNHBlyFyzHDhG200Jv3mFk5A== X-Received: by 2002:a17:902:523:: with SMTP id 32mr5826420plf.249.1553206802458; Thu, 21 Mar 2019 15:20:02 -0700 (PDT) Received: from desktop-bart.svl.corp.google.com ([2620:15c:2cd:203:5cdc:422c:7b28:ebb5]) by smtp.gmail.com with ESMTPSA id l7sm16862892pfj.162.2019.03.21.15.20.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:20:01 -0700 (PDT) From: Bart Van Assche To: David Miller Cc: netdev@vger.kernel.org, Bart Van Assche , Sagi Grimberg , Christoph Hellwig Subject: [PATCH 7/7] net/utils: Use strlcpy() instead of open-coding it Date: Thu, 21 Mar 2019 15:19:46 -0700 Message-Id: <20190321221946.163803-8-bvanassche@acm.org> X-Mailer: git-send-email 2.20.GIT In-Reply-To: <20190321221946.163803-1-bvanassche@acm.org> References: <20190321221946.163803-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch does not change any functionality but makes the code easier to read. Cc: Sagi Grimberg Cc: Christoph Hellwig Signed-off-by: Bart Van Assche --- net/core/utils.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/core/utils.c b/net/core/utils.c index 2a597ac7808e..5f11e89f173f 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -339,12 +339,8 @@ static int inet6_pton(struct net *net, const char *src, u16 port_num, src + srclen != scope_delim && *scope_delim == '%') { struct net_device *dev; char scope_id[16]; - size_t scope_len = min_t(size_t, sizeof(scope_id) - 1, - src + srclen - scope_delim - 1); - - memcpy(scope_id, scope_delim + 1, scope_len); - scope_id[scope_len] = '\0'; + strlcpy(scope_id, scope_delim + 1, sizeof(scope_id)); dev = dev_get_by_name(net, scope_id); if (dev) { addr6->sin6_scope_id = dev->ifindex; -- 2.21.0.155.ge902e9bcae20