packet: use a consistent hard_header_len in send paths
Subsystems (4)
PATCH 1/1 packet: use a consistent hard_header_len in send paths
packet_snd() and tpacket_snd() read dev->hard_header_len multiple times while building an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.
For SOCK_RAW, packet_snd() stores the first value in reserve, later allocates headroom using LL_RESERVED_SPACE(dev), and then subtracts reserve from the skb headroom. If hard_header_len decreases between the reads, the skb can be allocated with less headroom than reserve, moving skb->data before skb->head. The subsequent skb_copy_datagram_from_iter() can then attempt an out-of-bounds copy. Hardened usercopy catches this as a kernel memory overwrite attempt.
tpacket_snd() has the same issue because its allocation and tpacket_fill_skb() use separate hard_header_len reads.
Read hard_header_len once in each send path and use that snapshot consistently for skb allocation and construction.
--- net/packet/af_packet.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
net/packet/af_packet.c +21 -14
@@ -2569,6 +2569,7 @@ static int packet_snd_vnet_parse(struct msghdr *msg, size_t *len,static int tpacket_fill_skb (struct packet_sock *po,struct sk_buff *skb,void *frame,struct net_device *dev,void *data,int tp_len,__be16 proto,unsigned char *addr,int hlen,int copylen, +int hard_header_len,const struct sockcm_cookie *sockc) {union tpacket_uhdr ph;
@@ -2600,8 +2601,8 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, }else if (copylen) {int hdrlen =min_t (int, copylen, tp_len); -skb_push (skb, dev->hard_header_len); -skb_put (skb, copylen - dev->hard_header_len); +skb_push (skb, hard_header_len); +skb_put (skb, copylen - hard_header_len); err =skb_store_bits (skb,0 , data, hdrlen);if (unlikely (err))return err;
@@ -2732,7 +2733,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)void *data;int len_sum =0 ;int status =TP_STATUS_AVAILABLE ; -int hlen, tlen, copylen =0 ; +int hard_header_len, hlen, tlen, copylen =0 ;long timeo;mutex_lock (&po->pg_vec_lock);
@@ -2779,8 +2780,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_put; } + hard_header_len =READ_ONCE (dev->hard_header_len);if (po->sk.sk_socket->type ==SOCK_RAW ) - reserve = dev->hard_header_len; + reserve = hard_header_len; size_max = po->tx_ring.frame_size - (po->tp_hdrlen -sizeof (struct sockaddr_ll ));
@@ -2817,7 +2819,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto tpacket_error; status =TP_STATUS_SEND_REQUEST ; - hlen =LL_RESERVED_SPACE (dev); + hlen = ((hard_header_len +READ_ONCE (dev->needed_headroom)) & + ~(HH_DATA_MOD -1 )) +HH_DATA_MOD ; tlen = dev->needed_tailroom;if (vnet_hdr_sz) { data += vnet_hdr_sz;
@@ -2835,10 +2838,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) vnet_hdr.hdr_len); has_vnet_hdr = true; } - copylen =max_t (int, copylen, dev->hard_header_len); + copylen =max_t (int, copylen, hard_header_len); skb =sock_alloc_send_skb (&po->sk, hlen + tlen +sizeof (struct sockaddr_ll ) + - (copylen - dev->hard_header_len), + (copylen - hard_header_len), !need_wait, &err);if (unlikely (skb ==NULL )) {
@@ -2848,7 +2851,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_status; } tp_len =tpacket_fill_skb (po, skb, ph, dev, data, tp_len, proto, - addr, hlen, copylen, &sockc); + addr, hlen, copylen, hard_header_len, + &sockc); if (likely(tp_len >= 0) && tp_len > dev->mtu + reserve && !vnet_hdr_sz &&
@@ -2956,7 +2960,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)int offset =0 ;struct packet_sock *po =pkt_sk (sk);int vnet_hdr_sz =READ_ONCE (po->vnet_hdr_sz); -int hlen, tlen, linear; +int hard_header_len, hlen, tlen, linear;int extra_len =0 ;/*
@@ -2996,14 +3000,16 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; } -if (sock->type ==SOCK_RAW ) - reserve = dev->hard_header_len;if (vnet_hdr_sz) { err =packet_snd_vnet_parse (msg, &len, &vnet_hdr, vnet_hdr_sz);if (err) goto out_unlock; } + hard_header_len =READ_ONCE (dev->hard_header_len); +if (sock->type ==SOCK_RAW ) + reserve = hard_header_len; +if (unlikely (sock_flag (sk,SOCK_NOFCS ))) {if (!netif_supports_nofcs (dev)) { err = -EPROTONOSUPPORT ;
@@ -3018,10 +3024,11 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; err = -ENOBUFS ; - hlen =LL_RESERVED_SPACE (dev); + hlen = ((hard_header_len +READ_ONCE (dev->needed_headroom)) & + ~(HH_DATA_MOD -1 )) +HH_DATA_MOD ; tlen = dev->needed_tailroom; linear =__virtio16_to_cpu (vio_le (), vnet_hdr.hdr_len); - linear =max (linear,min_t (int, len, dev->hard_header_len)); + linear =max (linear,min_t (int, len, hard_header_len)); skb =packet_alloc_skb (sk, hlen + tlen, hlen, len, linear, msg->msg_flags &MSG_DONTWAIT , &err);if (skb ==NULL )
@@ -3037,7 +3044,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) }else if (reserve) {skb_reserve (skb, -reserve);if (len < reserve +sizeof (struct ipv6hdr ) && - dev->min_header_len != dev->hard_header_len) + dev->min_header_len != hard_header_len)skb_reset_network_header (skb); }
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 4 lines · Qihang
packet_snd()andtpacket_snd()readdev->hard_header_lenmultiple times while building an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.
Quoted 8 lines
For
SOCK_RAW,packet_snd()stores the first value in reserve, later allocates headroom usingLL_RESERVED_SPACE(dev), and then subtracts reserve from the skb headroom. Ifhard_header_lendecreases between the reads, the skb can be allocated with less headroom than reserve, movingskb->databeforeskb->head. The subsequentskb_copy_datagram_from_iter()can then attempt an out-of-bounds copy. Hardened usercopy catches this as a kernel memory overwrite attempt.
Wouldn't there be a similar issue in the SOCK_DGRAM path with dev_hard_header() calling skb_push() after packet_alloc_skb()?
Willem de Bruijn
maintainerQuoted 16 lines · Daniel Zahka
Quoted 4 lines · Qihang
packet_snd()andtpacket_snd()readdev->hard_header_lenmultiple times while building an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.Quoted 8 lines
For
SOCK_RAW,packet_snd()stores the first value in reserve, later allocates headroom usingLL_RESERVED_SPACE(dev), and then subtracts reserve from the skb headroom. Ifhard_header_lendecreases between the reads, the skb can be allocated with less headroom than reserve, movingskb->databeforeskb->head. The subsequentskb_copy_datagram_from_iter()can then attempt an out-of-bounds copy. Hardened usercopy catches this as a kernel memory overwrite attempt.
Quoted 2 lines
Wouldn't there be a similar issue in the
SOCK_DGRAMpath withdev_hard_header()callingskb_push()afterpacket_alloc_skb()?
Good point. this does not use hard_header_len directly, but e.g., eth_header() assumes ETH_HLEN is available to push.
Simply caching hard_header_len won't resolve this. dev->hard_header_len and dev->header_ops (incl .create) are not updated atomically.
I missed this earlier, but besides packet_snd and tpacket_snd, the fix is also needed by packet_sendmsg_spkt.
Agreed. Caching hard_header_len fixes the RAW paths' inconsistent skb arithmetic, but not the SOCK_DGRAM race between headroom allocation and header_ops->create().
I also missed packet_sendmsg_spkt(), which needs the same RAW-path fix.
Would you prefer a v2 covering the three RAW paths, with the DGRAM callback headroom issue handled separately, or both issues in one series?
Quoted 30 lines · Willem de Bruijn
Quoted 16 lines · Daniel Zahka
Quoted 4 lines · Qihang
packet_snd()andtpacket_snd()readdev->hard_header_lenmultiple times while building an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.Quoted 8 lines
For
SOCK_RAW,packet_snd()stores the first value in reserve, later allocates headroom usingLL_RESERVED_SPACE(dev), and then subtracts reserve from the skb headroom. Ifhard_header_lendecreases between the reads, the skb can be allocated with less headroom than reserve, movingskb->databeforeskb->head. The subsequentskb_copy_datagram_from_iter()can then attempt an out-of-bounds copy. Hardened usercopy catches this as a kernel memory overwrite attempt.Quoted 2 lines
Wouldn't there be a similar issue in the
SOCK_DGRAMpath withdev_hard_header()callingskb_push()afterpacket_alloc_skb()?Good point. this does not use
hard_header_lendirectly, but e.g.,eth_header()assumesETH_HLENis available to push.Simply caching
hard_header_lenwon't resolve this.dev->hard_header_lenanddev->header_ops(incl .create) are not updated atomically.I missed this earlier, but besides
packet_sndandtpacket_snd, the fix is also needed bypacket_sendmsg_spkt.
Willem de Bruijn
maintainerQuoted 9 lines · Qihang
Agreed. Caching
hard_header_lenfixes the RAW paths' inconsistent skb arithmetic, but not theSOCK_DGRAMrace between headroom allocation andheader_ops->create().I also missed
packet_sendmsg_spkt(), which needs the same RAW-path fix.Would you prefer a v2 covering the three RAW paths, with the DGRAM callback headroom issue handled separately, or both issues in one series?
Since the DGRAM path is non-trivial, better to fix that in a separate patch. Can be same series, but no need to delay the RAW patch for that. Thanks.
Quoted 32 lines
Quoted 30 lines · Willem de Bruijn
Quoted 16 lines · Daniel Zahka
Quoted 4 lines · Qihang
packet_snd()andtpacket_snd()readdev->hard_header_lenmultiple times while building an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.Quoted 8 lines
For
SOCK_RAW,packet_snd()stores the first value in reserve, later allocates headroom usingLL_RESERVED_SPACE(dev), and then subtracts reserve from the skb headroom. Ifhard_header_lendecreases between the reads, the skb can be allocated with less headroom than reserve, movingskb->databeforeskb->head. The subsequentskb_copy_datagram_from_iter()can then attempt an out-of-bounds copy. Hardened usercopy catches this as a kernel memory overwrite attempt.Quoted 2 lines
Wouldn't there be a similar issue in the
SOCK_DGRAMpath withdev_hard_header()callingskb_push()afterpacket_alloc_skb()?Good point. this does not use
hard_header_lendirectly, but e.g.,eth_header()assumesETH_HLENis available to push.Simply caching
hard_header_lenwon't resolve this.dev->hard_header_lenanddev->header_ops(incl .create) are not updated atomically.I missed this earlier, but besides
packet_sndandtpacket_snd, the fix is also needed bypacket_sendmsg_spkt.
PATCH v2 1/1 packet: use consistent header lengths in raw send paths
In reply to Qihangpacket_snd(), tpacket_snd(), and packet_sendmsg_spkt() read dev->hard_header_len multiple times while allocating and constructing an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.
For SOCK_RAW, packet_snd() can save a larger value in reserve and later allocate headroom using a smaller value. Moving skb->data back by reserve then places it before skb->head, and the following copy from userspace can attempt an out-of-bounds write.
tpacket_snd() similarly uses independent values for allocation and for the skb_push()/skb_put() operations in tpacket_fill_skb(). The legacy packet_sendmsg_spkt() path also calculates its reservation and header offset from separate reads before dropping the RCU read lock to allocate the skb. A larger offset than reservation can move skb->data before skb->head, while mixed TX-ring values can also make
copylen - hard_header_len negative.
Read hard_header_len once for each send operation and use that value for RAW allocation and construction. The trigger requires racing an AF_PACKET sender with privileged netdevice reconfiguration.
The separate SOCK_DGRAM consistency problem between hard_header_len and header_ops->create is not addressed here.
---
v2:
- Cover packet_sendmsg_spkt().
- Limit snapshot-based calculations to RAW construction; leave DGRAM unchanged for a separate fix.
Link to v1: https://lore.kernel.org/netdev/[email protected]/
--- net/packet/af_packet.c | 64 ++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 18 deletions(-)
net/packet/af_packet.c +46 -18
@@ -1953,6 +1953,7 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg,struct net_device *dev;struct sockcm_cookie sockc;__be16 proto =0 ; +unsigned int hard_header_len =0 ;int err;int extra_len =0 ;
@@ -1996,15 +1997,21 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, } extra_len =4 ;/* We're doing our own CRC */ } +if (!skb) + hard_header_len =READ_ONCE (dev->hard_header_len); err = -EMSGSIZE ; -if (len > dev->mtu + dev->hard_header_len +VLAN_HLEN + extra_len) +if (len > dev->mtu + hard_header_len +VLAN_HLEN + extra_len) goto out_unlock;if (!skb) { -size_t reserved =LL_RESERVED_SPACE (dev); +size_t reserved;int tlen = dev->needed_tailroom; -unsigned int hhlen = dev->header_ops ? dev->hard_header_len :0 ; +unsigned int hhlen =READ_ONCE (dev->header_ops) ? + hard_header_len :0 ; + + reserved = ((hard_header_len +READ_ONCE (dev->needed_headroom)) & + ~(HH_DATA_MOD -1 )) +HH_DATA_MOD ;rcu_read_unlock (); skb =sock_wmalloc (sk, len + reserved + tlen,0 ,GFP_KERNEL );
@@ -2569,6 +2576,7 @@ static int packet_snd_vnet_parse(struct msghdr *msg, size_t *len,static int tpacket_fill_skb (struct packet_sock *po,struct sk_buff *skb,void *frame,struct net_device *dev,void *data,int tp_len,__be16 proto,unsigned char *addr,int hlen,int copylen, +int hard_header_len,const struct sockcm_cookie *sockc) {union tpacket_uhdr ph;
@@ -2600,8 +2608,8 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, }else if (copylen) {int hdrlen =min_t (int, copylen, tp_len); -skb_push (skb, dev->hard_header_len); -skb_put (skb, copylen - dev->hard_header_len); +skb_push (skb, hard_header_len); +skb_put (skb, copylen - hard_header_len); err =skb_store_bits (skb,0 , data, hdrlen);if (unlikely (err))return err;
@@ -2732,7 +2740,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)void *data;int len_sum =0 ;int status =TP_STATUS_AVAILABLE ; -int hlen, tlen, copylen =0 ; +int hard_header_len =0 , hlen, tlen, copylen =0 ;long timeo;mutex_lock (&po->pg_vec_lock);
@@ -2779,8 +2787,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_put; } -if (po->sk.sk_socket->type ==SOCK_RAW ) - reserve = dev->hard_header_len; +if (po->sk.sk_socket->type ==SOCK_RAW ) { + hard_header_len =READ_ONCE (dev->hard_header_len); + reserve = hard_header_len; + } size_max = po->tx_ring.frame_size - (po->tp_hdrlen -sizeof (struct sockaddr_ll ));
@@ -2817,7 +2827,12 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto tpacket_error; status =TP_STATUS_SEND_REQUEST ; - hlen =LL_RESERVED_SPACE (dev); +if (po->sk.sk_socket->type ==SOCK_RAW ) + hlen = ((hard_header_len + +READ_ONCE (dev->needed_headroom)) & + ~(HH_DATA_MOD -1 )) +HH_DATA_MOD ; +else + hlen =LL_RESERVED_SPACE (dev); tlen = dev->needed_tailroom;if (vnet_hdr_sz) { data += vnet_hdr_sz;
@@ -2835,10 +2850,14 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) vnet_hdr.hdr_len); has_vnet_hdr = true; } - copylen =max_t (int, copylen, dev->hard_header_len); +if (po->sk.sk_socket->type ==SOCK_RAW ) + copylen =max_t (int, copylen, hard_header_len); +else + copylen =max_t (int, copylen, dev->hard_header_len); skb =sock_alloc_send_skb (&po->sk, hlen + tlen +sizeof (struct sockaddr_ll ) + - (copylen - dev->hard_header_len), + (copylen - (po->sk.sk_socket->type ==SOCK_RAW ? + hard_header_len : dev->hard_header_len)), !need_wait, &err);if (unlikely (skb ==NULL )) {
@@ -2848,7 +2867,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_status; } tp_len =tpacket_fill_skb (po, skb, ph, dev, data, tp_len, proto, - addr, hlen, copylen, &sockc); + addr, hlen, copylen, hard_header_len, + &sockc); if (likely(tp_len >= 0) && tp_len > dev->mtu + reserve && !vnet_hdr_sz &&
@@ -2956,7 +2976,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)int offset =0 ;struct packet_sock *po =pkt_sk (sk);int vnet_hdr_sz =READ_ONCE (po->vnet_hdr_sz); -int hlen, tlen, linear; +int hard_header_len =0 , hlen, tlen, linear;int extra_len =0 ;/*
@@ -2996,14 +3016,17 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; } -if (sock->type ==SOCK_RAW ) - reserve = dev->hard_header_len;if (vnet_hdr_sz) { err =packet_snd_vnet_parse (msg, &len, &vnet_hdr, vnet_hdr_sz);if (err) goto out_unlock; } +if (sock->type ==SOCK_RAW ) { + hard_header_len =READ_ONCE (dev->hard_header_len); + reserve = hard_header_len; + } +if (unlikely (sock_flag (sk,SOCK_NOFCS ))) {if (!netif_supports_nofcs (dev)) { err = -EPROTONOSUPPORT ;
@@ -3018,10 +3041,15 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; err = -ENOBUFS ; - hlen =LL_RESERVED_SPACE (dev); +if (sock->type ==SOCK_RAW ) + hlen = ((hard_header_len +READ_ONCE (dev->needed_headroom)) & + ~(HH_DATA_MOD -1 )) +HH_DATA_MOD ; +else + hlen =LL_RESERVED_SPACE (dev); tlen = dev->needed_tailroom; linear =__virtio16_to_cpu (vio_le (), vnet_hdr.hdr_len); - linear =max (linear,min_t (int, len, dev->hard_header_len)); + linear =max (linear,min_t (int, len, sock->type ==SOCK_RAW ? + hard_header_len : dev->hard_header_len)); skb =packet_alloc_skb (sk, hlen + tlen, hlen, len, linear, msg->msg_flags &MSG_DONTWAIT , &err);if (skb ==NULL )
@@ -3037,7 +3065,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) }else if (reserve) {skb_reserve (skb, -reserve);if (len < reserve +sizeof (struct ipv6hdr ) && - dev->min_header_len != dev->hard_header_len) + dev->min_header_len != hard_header_len)skb_reset_network_header (skb); }
Signature · 1 line
2.50.1 (Apple Git-155)
Willem de Bruijn
maintainerRe: [PATCH net v2] packet: use consistent header lengths in raw send paths
Quoted 22 lines · Qihang
packet_snd(),tpacket_snd(), andpacket_sendmsg_spkt()readdev->hard_header_lenmultiple times while allocating and constructing an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.For
SOCK_RAW,packet_snd()can save a larger value in reserve and later allocate headroom using a smaller value. Movingskb->databack by reserve then places it beforeskb->head, and the following copy from userspace can attempt an out-of-bounds write.
tpacket_snd()similarly uses independent values for allocation and for the skb_push()/skb_put() operations intpacket_fill_skb(). The legacypacket_sendmsg_spkt()path also calculates its reservation and header offset from separate reads before dropping the RCU read lock to allocate the skb. A larger offset than reservation can moveskb->databeforeskb->head, while mixed TX-ring values can also make
copylen -hard_header_lennegative.Read
hard_header_lenonce for each send operation and use that value for RAW allocation and construction. The trigger requires racing anAF_PACKETsender with privileged netdevice reconfiguration.
Quoted 5 lines
The separate
SOCK_DGRAMconsistency problem betweenhard_header_lenandheader_ops->createis not addressed here.Fixes b84bbaf7a6c8 ("packet: in packet_snd start writing at link layer allocation")Fixes 69e3c75f4d54 ("net: TX_RING and packet mmap")
Not sure whether a patch can have two fixes tags.
Maybe better two separate patches.
Quoted 18 lines
Signed-off-by Qihang <[email protected]>---
v2:
- Coverpacket_sendmsg_spkt().
- Limit snapshot-based calculations to RAW construction; leave DGRAM unchanged for a separate fix.Link to v1: https://lore.kernel.org/netdev/[email protected]/
--- net/packet/af_packet.c | 64 ++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 18 deletions(-)net/packet/af_packet.c +0
-0
net/packet/af_packet.c static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, · line 1956
Quoted 4 lines
net/packet/af_packet.c +1
-0@@ -1953,6 +1953,7 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg,struct net_device *dev;struct sockcm_cookie sockc;__be16 proto =0 ; +unsigned int hard_header_len =0 ;
Please keep reverse xmas tree ordering when not too inconvenient.
net/packet/af_packet.c static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, · line 2000
Quoted 8 lines
net/packet/af_packet.c +1
-0int err;int extra_len =0 ;@@ -1996,15 +1997,21 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, } extra_len =4 ;/* We're doing our own CRC */ } +if (!skb)
Why this branch?
net/packet/af_packet.c static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, · line 2010
Quoted 13 lines
net/packet/af_packet.c +4
-3+ hard_header_len =READ_ONCE (dev->hard_header_len); err = -EMSGSIZE ; -if (len > dev->mtu + dev->hard_header_len +VLAN_HLEN + extra_len) +if (len > dev->mtu + hard_header_len +VLAN_HLEN + extra_len) goto out_unlock;if (!skb) { -size_t reserved =LL_RESERVED_SPACE (dev); +size_t reserved;int tlen = dev->needed_tailroom; -unsigned int hhlen = dev->header_ops ? dev->hard_header_len :0 ; + unsigned int hhlen = READ_ONCE(dev->header_ops) ?
Why add this READ_ONCE? Other header_ops readers lack this.
net/packet/af_packet.c static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, · line 2014
Quoted 4 lines
net/packet/af_packet.c +4
-0+ hard_header_len :0 ; + + reserved = ((hard_header_len +READ_ONCE (dev->needed_headroom)) & + ~(HH_DATA_MOD -1 )) +HH_DATA_MOD ;
Now that this file uses this three times, it might be worthwhile creating an LL_RESERVED_SPACE_EX(dev, hhlen) wrapper. And have LL_RESERVED_SPACE call that. (optional).
net/packet/af_packet.c static int packet_snd_vnet_parse(struct msghdr *msg, size_t *len, · line 2579
Quoted 8 lines
net/packet/af_packet.c +1
-0rcu_read_unlock (); skb =sock_wmalloc (sk, len + reserved + tlen,0 ,GFP_KERNEL );@@ -2569,6 +2576,7 @@ static int packet_snd_vnet_parse(struct msghdr *msg, size_t *len, static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, void *frame, struct net_device *dev, void *data, int tp_len, __be16 proto, unsigned char *addr, int hlen, int copylen, + int hard_header_len,
Inconsistent unsigned int above vs int here. Dev field is unsigned short. Int is fine.
Quoted 37 lines
net/packet/af_packet.c +7
-5const struct sockcm_cookie *sockc) {union tpacket_uhdr ph;@@ -2600,8 +2608,8 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, }else if (copylen) {int hdrlen =min_t (int, copylen, tp_len); -skb_push (skb, dev->hard_header_len); -skb_put (skb, copylen - dev->hard_header_len); +skb_push (skb, hard_header_len); +skb_put (skb, copylen - hard_header_len); err =skb_store_bits (skb,0 , data, hdrlen);if (unlikely (err))return err;@@ -2732,7 +2740,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)void *data;int len_sum =0 ;int status =TP_STATUS_AVAILABLE ; -int hlen, tlen, copylen =0 ; +int hard_header_len =0 , hlen, tlen, copylen =0 ;long timeo;mutex_lock (&po->pg_vec_lock);@@ -2779,8 +2787,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_put; } -if (po->sk.sk_socket->type ==SOCK_RAW ) - reserve = dev->hard_header_len; +if (po->sk.sk_socket->type ==SOCK_RAW ) { + hard_header_len =READ_ONCE (dev->hard_header_len); + reserve = hard_header_len; + } size_max = po->tx_ring.frame_size - (po->tp_hdrlen -sizeof (struct sockaddr_ll ));
net/packet/af_packet.c static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) · line 2831
Quoted 6 lines
net/packet/af_packet.c +2
-1@@ -2817,7 +2827,12 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto tpacket_error; status =TP_STATUS_SEND_REQUEST ; - hlen =LL_RESERVED_SPACE (dev); +if (po->sk.sk_socket->type ==SOCK_RAW ) + hlen = ((hard_header_len +
Here and elsewhere: why special case this only for SOCK_RAW? This complicates control flow.
Quoted 93 lines
net/packet/af_packet.c +26
-9+ READ_ONCE(dev->needed_headroom)) & + ~(HH_DATA_MOD - 1)) + HH_DATA_MOD; + else + hlen =LL_RESERVED_SPACE (dev); tlen = dev->needed_tailroom;if (vnet_hdr_sz) { data += vnet_hdr_sz;@@ -2835,10 +2850,14 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) vnet_hdr.hdr_len); has_vnet_hdr = true; } - copylen =max_t (int, copylen, dev->hard_header_len); +if (po->sk.sk_socket->type ==SOCK_RAW ) + copylen =max_t (int, copylen, hard_header_len); +else + copylen =max_t (int, copylen, dev->hard_header_len); skb =sock_alloc_send_skb (&po->sk, hlen + tlen +sizeof (struct sockaddr_ll ) + - (copylen - dev->hard_header_len), + (copylen - (po->sk.sk_socket->type ==SOCK_RAW ? + hard_header_len : dev->hard_header_len)), !need_wait, &err);if (unlikely (skb ==NULL )) {@@ -2848,7 +2867,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_status; } tp_len =tpacket_fill_skb (po, skb, ph, dev, data, tp_len, proto, - addr, hlen, copylen, &sockc); + addr, hlen, copylen, hard_header_len, + &sockc); if (likely(tp_len >= 0) && tp_len > dev->mtu + reserve && !vnet_hdr_sz &&@@ -2956,7 +2976,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)int offset =0 ;struct packet_sock *po =pkt_sk (sk);int vnet_hdr_sz =READ_ONCE (po->vnet_hdr_sz); -int hlen, tlen, linear; +int hard_header_len =0 , hlen, tlen, linear;int extra_len =0 ;/* @@ -2996,14 +3016,17 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; } -if (sock->type ==SOCK_RAW ) - reserve = dev->hard_header_len;if (vnet_hdr_sz) { err =packet_snd_vnet_parse (msg, &len, &vnet_hdr, vnet_hdr_sz);if (err) goto out_unlock; } +if (sock->type ==SOCK_RAW ) { + hard_header_len =READ_ONCE (dev->hard_header_len); + reserve = hard_header_len; + } +if (unlikely (sock_flag (sk,SOCK_NOFCS ))) {if (!netif_supports_nofcs (dev)) { err = -EPROTONOSUPPORT ;@@ -3018,10 +3041,15 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; err = -ENOBUFS ; - hlen =LL_RESERVED_SPACE (dev); +if (sock->type ==SOCK_RAW ) + hlen = ((hard_header_len +READ_ONCE (dev->needed_headroom)) & + ~(HH_DATA_MOD -1 )) +HH_DATA_MOD ; +else + hlen =LL_RESERVED_SPACE (dev); tlen = dev->needed_tailroom; linear =__virtio16_to_cpu (vio_le (), vnet_hdr.hdr_len); - linear =max (linear,min_t (int, len, dev->hard_header_len)); + linear =max (linear,min_t (int, len, sock->type ==SOCK_RAW ? + hard_header_len : dev->hard_header_len)); skb =packet_alloc_skb (sk, hlen + tlen, hlen, len, linear, msg->msg_flags &MSG_DONTWAIT , &err);if (skb ==NULL )@@ -3037,7 +3065,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) }else if (reserve) {skb_reserve (skb, -reserve);if (len < reserve +sizeof (struct ipv6hdr ) && - dev->min_header_len != dev->hard_header_len) + dev->min_header_len != hard_header_len)skb_reset_network_header (skb); }Signature · 1 line
2.50.1 (Apple Git-155)
v3 cover packet: use consistent hard_header_len in send paths
In reply to QihangAF_PACKET send paths read dev->hard_header_len at several stages of skb allocation and construction. Concurrent netdevice reconfiguration can make those reads inconsistent and cause skb headroom underflow.
Split the regular and TX_RING paths so each patch has one Fixes tag. The separate SOCK_DGRAM consistency issue between hard_header_len and header_ops->create remains outside this series.
Changes in v3:
- Split into two patches, one Fixes tag each.
- Add LL_RESERVED_SPACE_EX() for calculations using a saved length.
- Use int consistently for saved header lengths.
- Drop unnecessary READ_ONCE(header_ops).
- Snapshot hard_header_len per-frame in the TX_RING path.
- Reset copylen for each frame.
Link to v2: https://lore.kernel.org/netdev/[email protected]/
Qihang (2):
packet: use consistent hard_header_len in non-ring send paths
packet: use consistent hard_header_len in TX_RING send path
include/linux/netdevice.h | 6 +++-- net/packet/af_packet.c | 47 ++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 20 deletions(-)
Signature · 1 line
2.50.1 (Apple Git-155)
v3 cover packet: use consistent hard_header_len in send paths
In reply to QihangAF_PACKET send paths read dev->hard_header_len at several stages of skb allocation and construction. Concurrent netdevice reconfiguration can make those reads inconsistent and cause skb headroom underflow.
Split the regular and TX_RING paths so each patch has one Fixes tag. The separate SOCK_DGRAM consistency issue between hard_header_len and header_ops->create remains outside this series.
Changes in v3:
- Split into two patches, one Fixes tag each.
- Add LL_RESERVED_SPACE_EX() for calculations using a saved length.
- Use int consistently for saved header lengths.
- Drop unnecessary READ_ONCE(header_ops).
- Snapshot hard_header_len per-frame in the TX_RING path.
- Reset copylen for each frame.
Link to v2: https://lore.kernel.org/netdev/[email protected]/
Qihang (2):
packet: use consistent hard_header_len in non-ring send paths
packet: use consistent hard_header_len in TX_RING send path
include/linux/netdevice.h | 6 +++-- net/packet/af_packet.c | 47 ++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 20 deletions(-)
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v3 1/2 packet: use consistent hard_header_len in non-ring send paths
packet_snd() reads dev->hard_header_len multiple times while allocating and constructing an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.
For SOCK_RAW, packet_snd() can save a larger value in reserve and later allocate headroom using a smaller value. Moving skb->data back by reserve then places it before skb->head, and the following copy from userspace can attempt an out-of-bounds write.
packet_sendmsg_spkt() has the same issue because it calculates its reservation and header offset from separate reads before dropping the RCU read lock to allocate the skb.
Add LL_RESERVED_SPACE_EX() for callers that already saved a header length. Read hard_header_len once in packet_snd() and use it for allocation and construction. In packet_sendmsg_spkt(), preserve the allocation-time value through the device lookup retry.
The separate SOCK_DGRAM consistency problem between hard_header_len and header_ops->create is not addressed here.
--- include/linux/netdevice.h | 6 ++++-- net/packet/af_packet.c | 26 ++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-)
include/linux/netdevice.h +4 -2
@@ -300,9 +300,11 @@ struct hh_cache {* We could use other alignment values, but we must maintain the * relationship HH alignment <= LL alignment. */ -#define LL_RESERVED_SPACE (dev) \ - ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom)) \ +#define LL_RESERVED_SPACE_EX (dev, hlen) \ + ((((hlen) + READ_ONCE((dev)->needed_headroom)) \ & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD) +#define LL_RESERVED_SPACE (dev) \ + LL_RESERVED_SPACE_EX(dev, (dev)->hard_header_len)#define LL_RESERVED_SPACE_EXTRA (dev,extra) \ ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom) + (extra)) \ & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
net/packet/af_packet.c +16 -10
@@ -1953,8 +1953,9 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg,struct net_device *dev;struct sockcm_cookie sockc;__be16 proto =0 ; -int err; +int hard_header_len;int extra_len =0 ; +int err;/* * Get and verify the address.
@@ -1997,14 +1998,18 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, extra_len =4 ;/* We're doing our own CRC */ } +/* Keep the allocation-time header length across retry. */ +if (!skb) + hard_header_len =READ_ONCE (dev->hard_header_len); + err = -EMSGSIZE ; -if (len > dev->mtu + dev->hard_header_len +VLAN_HLEN + extra_len) +if (len > dev->mtu + hard_header_len +VLAN_HLEN + extra_len) goto out_unlock;if (!skb) { -size_t reserved =LL_RESERVED_SPACE (dev); +size_t reserved =LL_RESERVED_SPACE_EX (dev, hard_header_len);int tlen = dev->needed_tailroom; -unsigned int hhlen = dev->header_ops ? dev->hard_header_len :0 ; +unsigned int hhlen = dev->header_ops ? hard_header_len :0 ;rcu_read_unlock (); skb =sock_wmalloc (sk, len + reserved + tlen,0 ,GFP_KERNEL );
@@ -2034,7 +2039,7 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, err = -EINVAL ; goto out_unlock; } -if (len > (dev->mtu + dev->hard_header_len + extra_len) && +if (len > (dev->mtu + hard_header_len + extra_len) && !packet_extra_vlan_len_allowed (dev, skb)) { err = -EMSGSIZE ; goto out_unlock;
@@ -2956,7 +2961,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)int offset =0 ;struct packet_sock *po =pkt_sk (sk);int vnet_hdr_sz =READ_ONCE (po->vnet_hdr_sz); -int hlen, tlen, linear; +int hard_header_len, hlen, tlen, linear;int extra_len =0 ;/*
@@ -2996,8 +3001,9 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; } + hard_header_len =READ_ONCE (dev->hard_header_len);if (sock->type ==SOCK_RAW ) - reserve = dev->hard_header_len; + reserve = hard_header_len;if (vnet_hdr_sz) { err =packet_snd_vnet_parse (msg, &len, &vnet_hdr, vnet_hdr_sz);if (err)
@@ -3018,10 +3024,10 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_unlock; err = -ENOBUFS ; - hlen =LL_RESERVED_SPACE (dev); + hlen =LL_RESERVED_SPACE_EX (dev, hard_header_len); tlen = dev->needed_tailroom; linear =__virtio16_to_cpu (vio_le (), vnet_hdr.hdr_len); - linear =max (linear,min_t (int, len, dev->hard_header_len)); + linear =max (linear,min_t (int, len, hard_header_len)); skb =packet_alloc_skb (sk, hlen + tlen, hlen, len, linear, msg->msg_flags &MSG_DONTWAIT , &err);if (skb ==NULL )
@@ -3037,7 +3043,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) }else if (reserve) {skb_reserve (skb, -reserve);if (len < reserve +sizeof (struct ipv6hdr ) && - dev->min_header_len != dev->hard_header_len) + dev->min_header_len != hard_header_len)skb_reset_network_header (skb); }
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v3 2/2 packet: use consistent hard_header_len in TX_RING send path
In reply to Qihangtpacket_snd() reads dev->hard_header_len independently for skb allocation and header construction in tpacket_fill_skb(). Concurrent netdevice reconfiguration can therefore make the reserved headroom smaller than the amount later pushed, or make copylen - hard_header_len negative.
Snapshot hard_header_len once for each frame after any wait and use it for headroom allocation, copy length, and skb construction. Pass the snapshot to tpacket_fill_skb(). Reset copylen for each frame so a previous frame cannot retain a larger construction length.
The separate SOCK_DGRAM consistency problem between hard_header_len and header_ops->create is not addressed here.
--- net/packet/af_packet.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
net/packet/af_packet.c +13 -8
@@ -2574,6 +2574,7 @@ static int packet_snd_vnet_parse(struct msghdr *msg, size_t *len,static int tpacket_fill_skb (struct packet_sock *po,struct sk_buff *skb,void *frame,struct net_device *dev,void *data,int tp_len,__be16 proto,unsigned char *addr,int hlen,int copylen, +int hard_header_len,const struct sockcm_cookie *sockc) {union tpacket_uhdr ph;
@@ -2605,8 +2606,8 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, }else if (copylen) {int hdrlen =min_t (int, copylen, tp_len); -skb_push (skb, dev->hard_header_len); -skb_put (skb, copylen - dev->hard_header_len); +skb_push (skb, hard_header_len); +skb_put (skb, copylen - hard_header_len); err =skb_store_bits (skb,0 , data, hdrlen);if (unlikely (err))return err;
@@ -2737,7 +2738,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)void *data;int len_sum =0 ;int status =TP_STATUS_AVAILABLE ; -int hlen, tlen, copylen =0 ; +int hard_header_len, hlen, tlen, copylen =0 ;long timeo;mutex_lock (&po->pg_vec_lock);
@@ -2784,8 +2785,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_put; } + hard_header_len =READ_ONCE (dev->hard_header_len);if (po->sk.sk_socket->type ==SOCK_RAW ) - reserve = dev->hard_header_len; + reserve = hard_header_len; size_max = po->tx_ring.frame_size - (po->tp_hdrlen -sizeof (struct sockaddr_ll ));
@@ -2822,8 +2824,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto tpacket_error; status =TP_STATUS_SEND_REQUEST ; - hlen =LL_RESERVED_SPACE (dev); + hard_header_len =READ_ONCE (dev->hard_header_len); + hlen =LL_RESERVED_SPACE_EX (dev, hard_header_len); tlen = dev->needed_tailroom; + copylen =0 ;if (vnet_hdr_sz) { data += vnet_hdr_sz; tp_len -= vnet_hdr_sz;
@@ -2840,10 +2844,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) vnet_hdr.hdr_len); has_vnet_hdr = true; } - copylen =max_t (int, copylen, dev->hard_header_len); + copylen =max_t (int, copylen, hard_header_len); skb =sock_alloc_send_skb (&po->sk, hlen + tlen +sizeof (struct sockaddr_ll ) + - (copylen - dev->hard_header_len), + (copylen - hard_header_len), !need_wait, &err);if (unlikely (skb ==NULL )) {
@@ -2853,7 +2857,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_status; } tp_len =tpacket_fill_skb (po, skb, ph, dev, data, tp_len, proto, - addr, hlen, copylen, &sockc); + addr, hlen, copylen, hard_header_len, + &sockc); if (likely(tp_len >= 0) && tp_len > dev->mtu + reserve && !vnet_hdr_sz &&
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH net v3 1/2] packet: use consistent hard_header_len in non-ring send paths
In reply to QihangQuoted 18 lines · Qihang
packet_snd()readsdev->hard_header_lenmultiple times while allocating and constructing an skb. Device reconfiguration can change this value concurrently, for example through bonding device type changes.For
SOCK_RAW,packet_snd()can save a larger value in reserve and later allocate headroom using a smaller value. Movingskb->databack by reserve then places it beforeskb->head, and the following copy from userspace can attempt an out-of-bounds write.
packet_sendmsg_spkt()has the same issue because it calculates its reservation and header offset from separate reads before dropping the RCU read lock to allocate the skb.Add
LL_RESERVED_SPACE_EX()for callers that already saved a header length. Readhard_header_lenonce inpacket_snd()and use it for allocation and construction. Inpacket_sendmsg_spkt(), preserve the allocation-time value through the device lookup retry.
Quoted 6 lines
The separate
SOCK_DGRAMconsistency problem betweenhard_header_lenandheader_ops->createis not addressed here.Fixes b84bbaf7a6c8 ("packet: in packet_snd start writing at link layer allocation")Signed-off-by Qihang <[email protected]>
New revisions should not be sent as a reply to an existing thread.
Willem de Bruijn
maintainerRe: [PATCH net v3 2/2] packet: use consistent hard_header_len in TX_RING send path
In reply to QihangQuoted 65 lines · Qihang
tpacket_snd()readsdev->hard_header_lenindependently for skb allocation and header construction intpacket_fill_skb(). Concurrent netdevice reconfiguration can therefore make the reserved headroom smaller than the amount later pushed, or make copylen -hard_header_lennegative.Snapshot
hard_header_lenonce for each frame after any wait and use it for headroom allocation, copy length, and skb construction. Pass the snapshot totpacket_fill_skb(). Reset copylen for each frame so a previous frame cannot retain a larger construction length.The separate
SOCK_DGRAMconsistency problem betweenhard_header_lenandheader_ops->createis not addressed here.Fixes 69e3c75f4d54 ("net: TX_RING and packet mmap")Signed-off-by Qihang <[email protected]>--- net/packet/af_packet.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)net/packet/af_packet.c +6
-4@@ -2574,6 +2574,7 @@ static int packet_snd_vnet_parse(struct msghdr *msg, size_t *len,static int tpacket_fill_skb (struct packet_sock *po,struct sk_buff *skb,void *frame,struct net_device *dev,void *data,int tp_len,__be16 proto,unsigned char *addr,int hlen,int copylen, +int hard_header_len,const struct sockcm_cookie *sockc) {union tpacket_uhdr ph;@@ -2605,8 +2606,8 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, }else if (copylen) {int hdrlen =min_t (int, copylen, tp_len); -skb_push (skb, dev->hard_header_len); -skb_put (skb, copylen - dev->hard_header_len); +skb_push (skb, hard_header_len); +skb_put (skb, copylen - hard_header_len); err =skb_store_bits (skb,0 , data, hdrlen);if (unlikely (err))return err;@@ -2737,7 +2738,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)void *data;int len_sum =0 ;int status =TP_STATUS_AVAILABLE ; -int hlen, tlen, copylen =0 ; +int hard_header_len, hlen, tlen, copylen =0 ;long timeo;mutex_lock (&po->pg_vec_lock);@@ -2784,8 +2785,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto out_put; } + hard_header_len =READ_ONCE (dev->hard_header_len);if (po->sk.sk_socket->type ==SOCK_RAW ) - reserve = dev->hard_header_len; + reserve = hard_header_len; size_max = po->tx_ring.frame_size - (po->tp_hdrlen -sizeof (struct sockaddr_ll ));
net/packet/af_packet.c static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) · line 2827
Quoted 5 lines
net/packet/af_packet.c +1
-1@@ -2822,8 +2824,10 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) goto tpacket_error; status =TP_STATUS_SEND_REQUEST ; - hlen =LL_RESERVED_SPACE (dev); + hard_header_len =READ_ONCE (dev->hard_header_len);
Can this now become inconsistent with the reserve read above, which is not reread per frame?
Quoted 6 lines
net/packet/af_packet.c +2
-0+ hlen =LL_RESERVED_SPACE_EX (dev, hard_header_len); tlen = dev->needed_tailroom; + copylen =0 ;if (vnet_hdr_sz) { data += vnet_hdr_sz; tp_len -= vnet_hdr_sz;