public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH iproute2 v2 9/9] bpf: avoid compiler warnings about strncpy
Date: Tue, 20 Mar 2018 13:29:09 -0700	[thread overview]
Message-ID: <20180320202909.22166-10-stephen@networkplumber.org> (raw)
In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org>

Use strlcpy to avoid cases where sizeof(buf) == strlen(buf)

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 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

  parent reply	other threads:[~2018-03-20 20:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-20 20:29 [PATCH iproute2 v2 0/9] gcc-8 warning fixes Stephen Hemminger
2018-03-20 20:29 ` [PATCH iproute2 v2 1/9] bridge: avoid snprint truncation on time Stephen Hemminger
2018-03-20 20:29 ` [PATCH iproute2 v2 2/9] pedit: fix strncpy warning Stephen Hemminger
2018-03-20 20:29 ` [PATCH iproute2 v2 3/9] ip: use strlcpy() to avoid truncation Stephen Hemminger
2018-03-20 20:29 ` [PATCH iproute2 v2 4/9] tunnel: use strlcpy to avoid strncpy warnings Stephen Hemminger
2018-03-20 20:29 ` [PATCH iproute2 v2 5/9] namespace: fix warning snprintf buffer Stephen Hemminger
2018-03-21  9:21   ` Sergei Shtylyov
2018-03-20 20:29 ` [PATCH iproute2 v2 6/9] tc_class: fix snprintf warning Stephen Hemminger
2018-03-20 20:29 ` [PATCH iproute2 v2 7/9] ematch: fix possible snprintf overflow Stephen Hemminger
2018-03-20 20:29 ` [PATCH iproute2 v2 8/9] misc: avoid snprintf warnings in ss and nstat Stephen Hemminger
2018-03-20 20:29 ` Stephen Hemminger [this message]
2018-03-20 21:12   ` [PATCH iproute2 v2 9/9] bpf: avoid compiler warnings about strncpy Daniel Borkmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180320202909.22166-10-stephen@networkplumber.org \
    --to=stephen@networkplumber.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox