matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bpf: avoid compiler warnings about strncpy 

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

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Stephen Hemminger 2018-03-19 16:36:39 -07:00
parent da8034a019
commit 08a93b32f5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/bpf.c
View File

@ -2593,7 +2593,7 @@ bpf_map_set_send(int fd, struct sockaddr_un *addr, unsigned int addr_len,
char *amsg_buf; char *amsg_buf;
int i; 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)); memcpy(&msg.aux.obj_st, aux->st, sizeof(msg.aux.obj_st));
cmsg_buf = bpf_map_set_init(&msg, addr, addr_len); 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; 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)); ret = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret < 0) { if (ret < 0) {
@ -2715,7 +2715,7 @@ int bpf_recv_map_fds(const char *path, int *fds, struct bpf_map_aux *aux,
return -1; 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)); ret = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret < 0) { if (ret < 0) {