net: don't call strlen() on the user buffer in packet_bind_spkt()
Subsystems (3)
PATCH 1/1 net: don't call strlen() on the user buffer in packet_bind_spkt()
KMSAN (KernelMemorySanitizer, a new error detection tool) reports use of uninitialized memory in packet_bind_spkt():
==================================================================
BUG: KMSAN: use of unitialized memory CPU: 0 PID: 1074 Comm: packet Not tainted 4.8.0-rc6+ #1891 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs
01/01/2011
0000000000000000 ffff88006b6dfc08 ffffffff82559ae8 ffff88006b6dfb48 ffffffff818a7c91 ffffffff85b9c870 0000000000000092 ffffffff85b9c550 0000000000000000 0000000000000092 00000000ec400911 0000000000000002
Call Trace: [< inline >] __dump_stack lib/dump_stack.c:15 [<ffffffff82559ae8>] dump_stack+0x238/0x290 lib/dump_stack.c:51 [<ffffffff818a6626>] kmsan_report+0x276/0x2e0 mm/kmsan/kmsan.c:1003 [<ffffffff818a783b>] __msan_warning+0x5b/0xb0 mm/kmsan/kmsan_instr.c:424 [< inline >] strlen lib/string.c:484 [<ffffffff8259b58d>] strlcpy+0x9d/0x200 lib/string.c:144 [<ffffffff84b2eca4>] packet_bind_spkt+0x144/0x230 net/packet/af_packet.c:3132 [<ffffffff84242e4d>] SYSC_bind+0x40d/0x5f0 net/socket.c:1370 [<ffffffff84242a22>] SyS_bind+0x82/0xa0 net/socket.c:1356 [<ffffffff8515991b>] entry_SYSCALL_64_fastpath+0x13/0x8f
arch/x86/entry/entry_64.o:?
chained origin: 00000000eba00911
[<ffffffff810bb787>] save_stack_trace+0x27/0x50arch/x86/kernel/stacktrace.c:67
[< inline >] kmsan_save_stack_with_flags mm/kmsan/kmsan.c:322 [< inline >] kmsan_save_stack mm/kmsan/kmsan.c:334 [<ffffffff818a59f8>] kmsan_internal_chain_origin+0x118/0x1e0 mm/kmsan/kmsan.c:527 [<ffffffff818a7773>] __msan_set_alloca_origin4+0xc3/0x130 mm/kmsan/kmsan_instr.c:380 [<ffffffff84242b69>] SYSC_bind+0x129/0x5f0 net/socket.c:1356 [<ffffffff84242a22>] SyS_bind+0x82/0xa0 net/socket.c:1356 [<ffffffff8515991b>] entry_SYSCALL_64_fastpath+0x13/0x8f
arch/x86/entry/entry_64.o:?
origin description: ----address@SYSC_bind (origin=00000000eb400911)
==================================================================
(the line numbers are relative to 4.8-rc6, but the bug persists upstream)
, when I run the following program as root:
=====================================
#include <string.h>
#include <sys/socket.h>
#include <netpacket/packet.h>
#include <net/ethernet.h>
int main() {
struct sockaddr addr;
memset(&addr, 0xff, sizeof(addr)); addr.sa_family = AF_PACKET;
int fd = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ALL)); bind(fd, &addr, sizeof(addr));
return 0;
}
=====================================
This happens because addr.sa_data copied from the userspace is not zero-terminated, and copying it with strlcpy() in packet_bind_spkt() results in calling strlen() on the kernel copy of that non-terminated buffer.
--- net/packet/af_packet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/packet/af_packet.c +5 -1
@@ -3111,7 +3111,11 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,if (addr_len !=sizeof (struct sockaddr ))return -EINVAL ; -strlcpy (name, uaddr->sa_data,sizeof (name)); +/* uaddr->sa_data comes from the userspace, it's not guaranteed to be +* zero-terminated. +*/ + name[14 ] ='\0' ; +strncpy (name, uaddr->sa_data,sizeof (name));return packet_do_bind (sk, name,0 ,pkt_sk (sk)->num); }
Signature · 1 line
2.11.0.483.g087da7b7c-goog
Quoted 78 lines · Alexander Potapenko
KMSAN (KernelMemorySanitizer, a new error detection tool) reports use of uninitialized memory in
packet_bind_spkt():==================================================================
BUG: KMSAN: use of unitialized memory CPU: 0 PID: 1074 Comm: packet Not tainted 4.8.0-rc6+ #1891 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs01/01/2011
0000000000000000ffff88006b6dfc08ffffffff82559ae8ffff88006b6dfb48ffffffff818a7c91ffffffff85b9c8700000000000000092ffffffff85b9c5500000000000000000 000000000000009200000000ec4009110000000000000002Call Trace: [< inline >] __dump_stack lib/dump_stack.c:15 [<ffffffff82559ae8>] dump_stack+0x238/0x290 lib/dump_stack.c:51 [<ffffffff818a6626>] kmsan_report+0x276/0x2e0 mm/kmsan/kmsan.c:1003 [<ffffffff818a783b>] __msan_warning+0x5b/0xb0 mm/kmsan/kmsan_instr.c:424 [< inline >] strlen lib/string.c:484 [<ffffffff8259b58d>] strlcpy+0x9d/0x200 lib/string.c:144 [<ffffffff84b2eca4>] packet_bind_spkt+0x144/0x230 net/packet/af_packet.c:3132 [<ffffffff84242e4d>] SYSC_bind+0x40d/0x5f0 net/socket.c:1370 [<ffffffff84242a22>] SyS_bind+0x82/0xa0 net/socket.c:1356 [<ffffffff8515991b>] entry_SYSCALL_64_fastpath+0x13/0x8f
arch/x86/entry/entry_64.o:?
chained origin:00000000eba00911
[<ffffffff810bb787>]save_stack_trace+0x27/0x50arch/x86/kernel/stacktrace.c:67[< inline >] kmsan_save_stack_with_flags mm/kmsan/kmsan.c:322 [< inline >] kmsan_save_stack mm/kmsan/kmsan.c:334 [<ffffffff818a59f8>] kmsan_internal_chain_origin+0x118/0x1e0 mm/kmsan/kmsan.c:527 [<ffffffff818a7773>] __msan_set_alloca_origin4+0xc3/0x130 mm/kmsan/kmsan_instr.c:380 [<ffffffff84242b69>] SYSC_bind+0x129/0x5f0 net/socket.c:1356 [<ffffffff84242a22>] SyS_bind+0x82/0xa0 net/socket.c:1356 [<ffffffff8515991b>] entry_SYSCALL_64_fastpath+0x13/0x8f
arch/x86/entry/entry_64.o:?
origin description: ----address@SYSC_bind (origin=00000000eb400911)
==================================================================
(the line numbers are relative to 4.8-rc6, but the bug persists upstream), when I run the following program as root:
=====================================
#include <string.h>
#include <sys/socket.h>
#include <netpacket/packet.h>
#include <net/ethernet.h>int main() { struct sockaddr addr; memset(&addr, 0xff, sizeof(addr)); addr.sa_family = AF_PACKET; int fd = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ALL)); bind(fd, &addr, sizeof(addr)); return 0;}
=====================================This happens because addr.sa_data copied from the userspace is not zero-terminated, and copying it with
strlcpy()inpacket_bind_spkt()results in callingstrlen()on the kernel copy of that non-terminated buffer.Signed-off-by Alexander Potapenko <[email protected]>--- net/packet/af_packet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)net/packet/af_packet.c +0
-0@@ -3111,7 +3111,11 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,if (addr_len !=sizeof (struct sockaddr ))
net/packet/af_packet.c static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, · line 3121
Quoted 10 lines
net/packet/af_packet.c +5
-1return -EINVAL ; -strlcpy (name, uaddr->sa_data,sizeof (name)); +/* uaddr->sa_data comes from the userspace, it's not guaranteed to be +* zero-terminated. +*/ + name[14 ] ='\0' ; +strncpy (name, uaddr->sa_data,sizeof (name));return packet_do_bind (sk, name,0 ,pkt_sk (sk)->num); }
It looks a bug in this implementation of strlcpy() then.
sizeof(name) is 15.
If you use strncpy(X, uaddr->sa_data, 15) , then you might access uaddr->sa_data[14] and this would still be wrong, since sa_data has 14 bytes only :
struct sockaddr {
sa_family_t sa_family;
char sa_data[14];
};
So I do not believe your patch is right.
Quoted 2 lines · Eric Dumazet
It looks a bug in this implementation of
strlcpy()then.
Apparently strlcpy(dest, src, size) returns strlen(src), so we can not use it in this context.
Quoted 11 lines
sizeof(name) is 15.
If you use
strncpy(X, uaddr->sa_data, 15), then you might access uaddr->sa_data[14] and this would still be wrong, sincesa_datahas 14 bytes only :struct sockaddr {
sa_family_tsa_family;
char sa_data[14];
};
Maybe then :
net/packet/af_packet.c +3 -2
@@ -3103,7 +3103,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int addr_len) {struct sock *sk = sock->sk; -char name[15 ]; +char name[sizeof (uaddr->sa_data) +1 ];/* * Check legality
@@ -3111,7 +3111,8 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,if (addr_len !=sizeof (struct sockaddr ))return -EINVAL ; -strlcpy (name, uaddr->sa_data,sizeof (name)); +memcpy (name, uaddr->sa_data,sizeof (uaddr->sa_data)); + name[sizeof (uaddr->sa_data)] =0 ;return packet_do_bind (sk, name,0 ,pkt_sk (sk)->num); }
Quoted 7 lines · Eric Dumazet
Quoted 2 lines · Eric Dumazet
It looks a bug in this implementation of
strlcpy()then.Apparently
strlcpy(dest, src, size)returns strlen(src), so we can not use it in this context.
Good point.
Quoted 29 lines
Quoted 11 lines
sizeof(name) is 15.
If you use
strncpy(X, uaddr->sa_data, 15), then you might access uaddr->sa_data[14] and this would still be wrong, sincesa_datahas 14 bytes only :struct sockaddr {
sa_family_tsa_family;
char sa_data[14];
};Maybe then :
net/packet/af_packet.c +1
-1@@ -3103,7 +3103,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int addr_len) {struct sock *sk = sock->sk; -char name[15 ]; +char name[sizeof (uaddr->sa_data) +1 ];/* * Check legality
net/packet/af_packet.c static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, · line 3118
Quoted 9 lines
net/packet/af_packet.c +2
-1@@ -3111,7 +3111,8 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,if (addr_len !=sizeof (struct sockaddr ))return -EINVAL ; -strlcpy (name, uaddr->sa_data,sizeof (name)); +memcpy (name, uaddr->sa_data,sizeof (uaddr->sa_data)); + name[sizeof (uaddr->sa_data)] =0 ;return packet_do_bind (sk, name,0 ,pkt_sk (sk)->num); }
SGTM. Shall I send the updated patch? (Sorry for asking, the patch culture is hard)
Quoted 1 line
Signature · 10 lines
Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Straße, 33 80636 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
Quoted 2 lines · Alexander Potapenko
SGTM. Shall I send the updated patch? (Sorry for asking, the patch culture is hard)
It is always nice to wait for feedback(s), before sending a v2, and a v3, and a v4.
Sending 4 patches in one hour is considered not friendly ;)
So if I were you, I would wait a bit for additional comments before sending a new version.
Thanks.
Quoted 87 lines · Eric Dumazet
Quoted 86 lines · Alexander Potapenko
KMSAN (KernelMemorySanitizer, a new error detection tool) reports use of uninitialized memory in
packet_bind_spkt():==================================================================
BUG: KMSAN: use of unitialized memory CPU: 0 PID: 1074 Comm: packet Not tainted 4.8.0-rc6+ #1891 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs01/01/2011
0000000000000000ffff88006b6dfc08ffffffff82559ae8ffff88006b6dfb48ffffffff818a7c91ffffffff85b9c8700000000000000092ffffffff85b9c5500000000000000000 000000000000009200000000ec4009110000000000000002Call Trace: [< inline >] __dump_stack lib/dump_stack.c:15 [<ffffffff82559ae8>] dump_stack+0x238/0x290 lib/dump_stack.c:51 [<ffffffff818a6626>] kmsan_report+0x276/0x2e0 mm/kmsan/kmsan.c:1003 [<ffffffff818a783b>] __msan_warning+0x5b/0xb0 mm/kmsan/kmsan_instr.c:424 [< inline >] strlen lib/string.c:484 [<ffffffff8259b58d>] strlcpy+0x9d/0x200 lib/string.c:144 [<ffffffff84b2eca4>] packet_bind_spkt+0x144/0x230 net/packet/af_packet.c:3132 [<ffffffff84242e4d>] SYSC_bind+0x40d/0x5f0 net/socket.c:1370 [<ffffffff84242a22>] SyS_bind+0x82/0xa0 net/socket.c:1356 [<ffffffff8515991b>] entry_SYSCALL_64_fastpath+0x13/0x8f
arch/x86/entry/entry_64.o:?
chained origin:00000000eba00911
[<ffffffff810bb787>]save_stack_trace+0x27/0x50arch/x86/kernel/stacktrace.c:67[< inline >] kmsan_save_stack_with_flags mm/kmsan/kmsan.c:322 [< inline >] kmsan_save_stack mm/kmsan/kmsan.c:334 [<ffffffff818a59f8>] kmsan_internal_chain_origin+0x118/0x1e0 mm/kmsan/kmsan.c:527 [<ffffffff818a7773>] __msan_set_alloca_origin4+0xc3/0x130 mm/kmsan/kmsan_instr.c:380 [<ffffffff84242b69>] SYSC_bind+0x129/0x5f0 net/socket.c:1356 [<ffffffff84242a22>] SyS_bind+0x82/0xa0 net/socket.c:1356 [<ffffffff8515991b>] entry_SYSCALL_64_fastpath+0x13/0x8f
arch/x86/entry/entry_64.o:?
origin description: ----address@SYSC_bind (origin=00000000eb400911)
==================================================================
(the line numbers are relative to 4.8-rc6, but the bug persists upstream), when I run the following program as root:
=====================================
#include <string.h>
#include <sys/socket.h>
#include <netpacket/packet.h>
#include <net/ethernet.h>int main() { struct sockaddr addr; memset(&addr, 0xff, sizeof(addr)); addr.sa_family = AF_PACKET; int fd = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ALL)); bind(fd, &addr, sizeof(addr)); return 0;}
=====================================This happens because addr.sa_data copied from the userspace is not zero-terminated, and copying it with
strlcpy()inpacket_bind_spkt()results in callingstrlen()on the kernel copy of that non-terminated buffer.Signed-off-by Alexander Potapenko <[email protected]>--- net/packet/af_packet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)net/packet/af_packet.c +5
-1@@ -3111,7 +3111,11 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,if (addr_len !=sizeof (struct sockaddr ))return -EINVAL ; -strlcpy (name, uaddr->sa_data,sizeof (name)); +/* uaddr->sa_data comes from the userspace, it's not guaranteed to be +* zero-terminated. +*/ + name[14 ] ='\0' ; +strncpy (name, uaddr->sa_data,sizeof (name));
Quoted 4 lines
net/packet/af_packet.c static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, · line 3121
Quoted 2 lines
net/packet/af_packet.c +0
-0return packet_do_bind (sk, name,0 ,pkt_sk (sk)->num); }It looks a bug in this implementation of
strlcpy()then.
This depends on how we define the semantics of strlcpy(). The implementation in lib/string.c
(http://lxr.free-electrons.com/source/lib/string.c#L129) says that we're copying a C-string |src|, which _may_ denote it should be zero-terminated.
I would still call strnlen() instead of strlen() in strlcpy() though.
Quoted 7 lines
sizeof(name) is 15.
If you use
strncpy(X, uaddr->sa_data, 15), then you might access uaddr->sa_data[14] and this would still be wrong, sincesa_datahas 14 bytes only :
Quoted 7 lines
struct sockaddr {
sa_family_tsa_family;
char sa_data[14];
};So I do not believe your patch is right.
Sorry, I've sent a fixed patch while you were writing your comment. Of course, we shouldn't copy more than 14 bytes.
Quoted 1 line
Signature · 10 lines
Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Straße, 33 80636 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg