Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00ec3ab0 authored by Qian Cai's avatar Qian Cai Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: replace a strncpy() with strscpy() 



To make overflows as obvious as possible and to prevent code from blithely
proceeding with a truncated string. This also has a side-effect to fix a
compilation warning when using GCC 8.2.1.

net/netfilter/ipset/ip_set_core.c: In function 'ip_set_sockfn_get':
net/netfilter/ipset/ip_set_core.c:2027:3: warning: 'strncpy' writing 32 bytes into a region of size 2 overflows the destination [-Wstringop-overflow=]

Signed-off-by: default avatarQian Cai <cai@gmx.us>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8e350ce1

net/netfilter/ipset/ip_set_core.c

+4 −2
Original line number Diff line number Diff line
@@ -2154,9 +2154,11 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) 
		}

		nfnl_lock(NFNL_SUBSYS_IPSET);

		set = ip_set(inst, req_get->set.index);

		strncpy(req_get->set.name, set ? set->name : "",

		ret = strscpy(req_get->set.name, set ? set->name : "",

			      IPSET_MAXNAMELEN);

		nfnl_unlock(NFNL_SUBSYS_IPSET);

		if (ret < 0)

			goto done;

		goto copy;

	}

	default: