packet: in recvmsg msg_name return at least sizeof sockaddr_ll
Subsystems (3)
Willem de Bruijn
maintainerPATCH v2 1/1 packet: in recvmsg msg_name return at least sizeof sockaddr_ll
From: Willem de Bruijn <[email protected]>
Packet send checks that msg_name is at least sizeof sockaddr_ll. Packet recv must return at least this length, so that its output can be passed unmodified to packet send.
This ceased to be true since adding support for lladdr longer than sll_addr. Since, the return value uses true address length.
Always return at least sizeof sockaddr_ll, even if address length is shorter. Zero the padding bytes.
Change v1->v2: do not overwrite zeroed padding again. use copy_len.
--- net/packet/af_packet.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/packet/af_packet.c +11 -2
@@ -3348,20 +3348,29 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { +int copy_len; +/* If the address length field is there to be filled * in, we fill it in now. */ if (sock->type ==SOCK_PACKET ) {__sockaddr_check_size (sizeof (struct sockaddr_pkt )); msg->msg_namelen =sizeof (struct sockaddr_pkt ); + copy_len = msg->msg_namelen; }else {struct sockaddr_ll *sll = &PACKET_SKB_CB (skb)->sa.ll; msg->msg_namelen = sll->sll_halen + offsetof(struct sockaddr_ll , sll_addr); + copy_len = msg->msg_namelen; +if (msg->msg_namelen <sizeof (struct sockaddr_ll )) { +memset (msg->msg_name + + offsetof(struct sockaddr_ll , sll_addr), +0 ,sizeof (sll->sll_addr)); + msg->msg_namelen =sizeof (struct sockaddr_ll ); + } } -memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, - msg->msg_namelen); +memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, copy_len); }if (pkt_sk (sk)->auxdata) {
Signature · 1 line
2.21.0.593.g511ec345e18-goog
From: Willem de Bruijn
Quoted 57 lines
Sent: 29 April 2019 16:47
Packet send checks thatmsg_nameis at least sizeofsockaddr_ll. Packet recv must return at least this length, so that its output can be passed unmodified to packet send.This ceased to be true since adding support for lladdr longer than
sll_addr. Since, the return value uses true address length.Always return at least sizeof
sockaddr_ll, even if address length is shorter. Zero the padding bytes.Change
v1->v2: do not overwrite zeroed padding again. usecopy_len.Fixes 0fb375fb9b93 ("[AF_PACKET]: Allow for > 8 byte hardware addresses.")Suggested-by David Laight <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>--- net/packet/af_packet.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)net/packet/af_packet.c +11
-3@@ -3348,20 +3348,29 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { +int copy_len; +/* If the address length field is there to be filled * in, we fill it in now. */ if (sock->type ==SOCK_PACKET ) {__sockaddr_check_size (sizeof (struct sockaddr_pkt )); msg->msg_namelen =sizeof (struct sockaddr_pkt ); + copy_len = msg->msg_namelen; }else {struct sockaddr_ll *sll = &PACKET_SKB_CB (skb)->sa.ll; msg->msg_namelen = sll->sll_halen + offsetof(struct sockaddr_ll , sll_addr); + copy_len = msg->msg_namelen; +if (msg->msg_namelen <sizeof (struct sockaddr_ll )) { +memset (msg->msg_name + + offsetof(struct sockaddr_ll , sll_addr), +0 ,sizeof (sll->sll_addr)); + msg->msg_namelen =sizeof (struct sockaddr_ll ); + } } -memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, - msg->msg_namelen); +memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, copy_len); }if (pkt_sk (sk)->auxdata) { --
Quoted 1 line
2.21.0.593.g511ec345e18-goog
Looks ok to me, not tried to compile it though.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Willem de Bruijn
maintainerQuoted 19 lines · David Laight
From: Willem de Bruijn
Quoted 17 lines
Sent: 29 April 2019 16:47
Packet send checks thatmsg_nameis at least sizeofsockaddr_ll. Packet recv must return at least this length, so that its output can be passed unmodified to packet send.This ceased to be true since adding support for lladdr longer than
sll_addr. Since, the return value uses true address length.Always return at least sizeof
sockaddr_ll, even if address length is shorter. Zero the padding bytes.Change
v1->v2: do not overwrite zeroed padding again. usecopy_len.Fixes 0fb375fb9b93 ("[AF_PACKET]: Allow for > 8 byte hardware addresses.")Suggested-by David Laight <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>---
..
Quoted 2 lines
Looks ok to me, not tried to compile it though.
Thanks again. I did that and also ran a small recv test that verifies namelen (but clearly did not help me see the stupid bug I made in v1..).
David Miller
maintainerFrom: Willem de Bruijn <[email protected]>
Date: Mon, 29 Apr 2019 11:46:55 -0400
Quoted 9 lines
From: Willem de Bruijn <[email protected]>
Packet send checks that
msg_nameis at least sizeofsockaddr_ll. Packet recv must return at least this length, so that its output can be passed unmodified to packet send.This ceased to be true since adding support for lladdr longer than
sll_addr. Since, the return value uses true address length.
Quoted 8 lines
Always return at least sizeof
sockaddr_ll, even if address length is shorter. Zero the padding bytes.Change
v1->v2: do not overwrite zeroed padding again. usecopy_len.Fixes 0fb375fb9b93 ("[AF_PACKET]: Allow for > 8 byte hardware addresses.")Suggested-by David Laight <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>
Applied and queued up for -stable.