From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f65.google.com ([209.85.160.65]:36761 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751628AbeCTU3Z (ORCPT ); Tue, 20 Mar 2018 16:29:25 -0400 Received: by mail-pl0-f65.google.com with SMTP id 61-v6so1729789plf.3 for ; Tue, 20 Mar 2018 13:29:25 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 9/9] bpf: avoid compiler warnings about strncpy Date: Tue, 20 Mar 2018 13:29:09 -0700 Message-Id: <20180320202909.22166-10-stephen@networkplumber.org> In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org List-ID: Use strlcpy to avoid cases where sizeof(buf) == strlen(buf) Signed-off-by: Stephen Hemminger --- lib/bpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bpf.c b/lib/bpf.c index c38d92d87759..04bc5a5685d5 100644 --- a/lib/bpf.c +++ b/lib/bpf.c @@ -2593,7 +2593,7 @@ bpf_map_set_send(int fd, struct sockaddr_un *addr, unsigned int addr_len, char *amsg_buf; int i; - strncpy(msg.aux.obj_name, aux->obj, sizeof(msg.aux.obj_name)); + strlcpy(msg.aux.obj_name, aux->obj, sizeof(msg.aux.obj_name)); memcpy(&msg.aux.obj_st, aux->st, sizeof(msg.aux.obj_st)); cmsg_buf = bpf_map_set_init(&msg, addr, addr_len); @@ -2682,7 +2682,7 @@ int bpf_send_map_fds(const char *path, const char *obj) return -1; } - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strlcpy(addr.sun_path, path, sizeof(addr.sun_path)); ret = connect(fd, (struct sockaddr *)&addr, sizeof(addr)); if (ret < 0) { @@ -2715,7 +2715,7 @@ int bpf_recv_map_fds(const char *path, int *fds, struct bpf_map_aux *aux, return -1; } - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strlcpy(addr.sun_path, path, sizeof(addr.sun_path)); ret = bind(fd, (struct sockaddr *)&addr, sizeof(addr)); if (ret < 0) { -- 2.16.2