Skip to contentSkip to conversation

net: ipv4: memset addr before calling copy_to_user()

PATCH In review Loganaden Velvindron 2 participants 2 messages Nov 9, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ipv4: memset addr before calling copy_to_user()

zero addr before calling copy_to_user()

---
 net/ipv4/ip_sockglue.c | 1 +
 1 file changed, 1 insertion(+)
net/ipv4/ip_sockglue.c +1 -0
index c3c359a..d7a5a8b 100644
@@ -1373,6 +1373,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
 	case IP_MULTICAST_IF:
 	{
 		struct in_addr addr;
+		memset(&addr, 0, sizeof(addr));
 		len = min_t(unsigned int, len, sizeof(struct in_addr));
 		addr.s_addr = inet->mc_addr;
 		release_sock(sk);
Signature · 1 line
2.6.2
#1 lore raw

Hello,

Quoted 19 lines · Loganaden Velvindron

zero addr before calling copy_to_user()

---
 net/ipv4/ip_sockglue.c | 1 +
 1 file changed, 1 insertion(+)
net/ipv4/ip_sockglue.c +1 -0
index c3c359a..d7a5a8b 100644
@@ -1373,6 +1373,7 @@ static int do_ip_getsockopt(struct sock *sk, int
 level, int optname,
 	case IP_MULTICAST_IF:
 	{
 		struct in_addr addr;
+               memset(&addr, 0, sizeof(addr));
 		len = min_t(unsigned int, len, sizeof(struct in_addr));
 		addr.s_addr = inet->mc_addr;
Quoted 1 line

release_sock(sk);

There is no possibility we leak any unwanted data to user space here.

If you are not sure if sizeof(addr) > sizeof(addr.s_addr) use a designated initializer:

addr = { .s_addr = inet->mc_addr };

which clears all other non-initialized elements. But here we are very certain.

We do not do defensive programming, we try to do logical things, and only logical things.
— Eric Dumazet (Thanks to Dan Carpenter.)

Bye,
Hannes