net: guard timestamp cmsgs to real error queue skbs
Subsystems (3)
PATCH 1/1 net: guard timestamp cmsgs to real error queue skbs
skb_is_err_queue() treats PACKET_OUTGOING as the sole marker for an skb from sk_error_queue. That assumption is not true for AF_PACKET sockets:
outgoing packet taps are also delivered to packet sockets with skb->pkt_type == PACKET_OUTGOING, but their skb->cb is owned by AF_PACKET instead of struct sock_exterr_skb.
If such an skb is received with timestamping enabled, the generic timestamp cmsg path can read AF_PACKET control-buffer state as sock_exterr_skb::opt_stats. With SO_RXQ_OVFL enabled, the packet drop counter overlaps opt_stats. An odd drop count makes the path emit SCM_TIMESTAMPING_OPT_STATS with skb->len and skb->data. For non-linear skbs this copies past the linear head and can trigger hardened usercopy or disclose adjacent heap contents.
Keep skb_is_err_queue() local to net/socket.c, but make it verify that the PACKET_OUTGOING marker is paired with the sock_rmem_free destructor installed by sock_queue_err_skb(). AF_PACKET receive skbs use normal receive ownership and no longer pass as error-queue skbs, while legitimate sk_error_queue entries keep the PACKET_OUTGOING marker and sock_rmem_free ownership.
--- include/net/sock.h | 1 + net/core/skbuff.c | 6 +++--- net/socket.c | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-)
include/net/sock.h +1 -0
@@ -1856,6 +1856,7 @@ struct sk_buff *sock_omalloc(struct sock *sk, unsigned long size, gfp_t priority);void skb_orphan_partial (struct sk_buff *skb);void sock_rfree (struct sk_buff *skb); +void sock_rmem_free (struct sk_buff *skb);void sock_efree (struct sk_buff *skb);#ifdef CONFIG_INET void sock_edemux (struct sk_buff *skb);
net/core/skbuff.c +3 -3
@@ -5450,7 +5450,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer) }EXPORT_SYMBOL_GPL (skb_cow_data); -static void sock_rmem_free (struct sk_buff *skb) +void sock_rmem_free (struct sk_buff *skb) {struct sock *sk = skb->sk;
@@ -5459,8 +5459,8 @@ static void sock_rmem_free(struct sk_buff *skb)static void skb_set_err_queue (struct sk_buff *skb) { -/* pkt_type of skbs received on local sockets is never PACKET_OUTGOING. -* So, it is safe to (mis)use it to mark skbs on the error queue. +/* The error-queue test in skb_is_err_queue() matches this marker +* with the sock_rmem_free destructor installed by sock_queue_err_skb(). */ skb->pkt_type =PACKET_OUTGOING ;BUILD_BUG_ON (PACKET_OUTGOING ==0 );
net/socket.c +6 -5
@@ -852,12 +852,13 @@ EXPORT_SYMBOL(kernel_sendmsg);static bool skb_is_err_queue (const struct sk_buff *skb) { -/* pkt_type of skbs enqueued on the error queue are set to -* PACKET_OUTGOING in skb_set_err_queue(). This is only safe to do -* in recvmsg, since skbs received on a local socket will never -* have a pkt_type of PACKET_OUTGOING. +/* Error-queue skbs are marked as PACKET_OUTGOING in +* skb_set_err_queue() and use the destructor installed by +* sock_queue_err_skb(). PACKET_OUTGOING alone is not unique: +* AF_PACKET outgoing taps use the same pkt_type. */ -return skb->pkt_type ==PACKET_OUTGOING ; +return skb->pkt_type ==PACKET_OUTGOING && + skb->destructor == sock_rmem_free; }/* On transmit, software and hardware timestamps are returned independently.
Signature · 1 line
2.43.0
Quoted 22 lines · Kyle Zeng
skb_is_err_queue()treatsPACKET_OUTGOINGas the sole marker for an skb fromsk_error_queue. That assumption is not true forAF_PACKETsockets:
outgoing packet taps are also delivered to packet sockets withskb->pkt_type==PACKET_OUTGOING, but theirskb->cbis owned byAF_PACKETinstead of structsock_exterr_skb.If such an skb is received with timestamping enabled, the generic timestamp cmsg path can read
AF_PACKETcontrol-buffer state assock_exterr_skb::opt_stats. WithSO_RXQ_OVFLenabled, the packet drop counter overlapsopt_stats. An odd drop count makes the path emitSCM_TIMESTAMPING_OPT_STATSwithskb->lenandskb->data. For non-linear skbs this copies past the linear head and can trigger hardened usercopy or disclose adjacent heap contents.Keep
skb_is_err_queue()local tonet/socket.c, but make it verify that thePACKET_OUTGOINGmarker is paired with thesock_rmem_freedestructor installed bysock_queue_err_skb().AF_PACKETreceive skbs use normal receive ownership and no longer pass as error-queue skbs, while legitimatesk_error_queueentries keep thePACKET_OUTGOINGmarker andsock_rmem_freeownership.
Quoted 2 lines
Fixes 8605330aac5a ("tcp: fix SCM_TIMESTAMPING_OPT_STATS for normal skbs")Signed-off-by Kyle Zeng <[email protected]>
Quoted 22 lines · Kyle Zeng
skb_is_err_queue()treatsPACKET_OUTGOINGas the sole marker for an skb fromsk_error_queue. That assumption is not true forAF_PACKETsockets:
outgoing packet taps are also delivered to packet sockets withskb->pkt_type==PACKET_OUTGOING, but theirskb->cbis owned byAF_PACKETinstead of structsock_exterr_skb.If such an skb is received with timestamping enabled, the generic timestamp cmsg path can read
AF_PACKETcontrol-buffer state assock_exterr_skb::opt_stats. WithSO_RXQ_OVFLenabled, the packet drop counter overlapsopt_stats. An odd drop count makes the path emitSCM_TIMESTAMPING_OPT_STATSwithskb->lenandskb->data. For non-linear skbs this copies past the linear head and can trigger hardened usercopy or disclose adjacent heap contents.Keep
skb_is_err_queue()local tonet/socket.c, but make it verify that thePACKET_OUTGOINGmarker is paired with thesock_rmem_freedestructor installed bysock_queue_err_skb().AF_PACKETreceive skbs use normal receive ownership and no longer pass as error-queue skbs, while legitimatesk_error_queueentries keep thePACKET_OUTGOINGmarker andsock_rmem_freeownership.
Quoted 2 lines
Fixes 8605330aac5a ("tcp: fix SCM_TIMESTAMPING_OPT_STATS for normal skbs")Signed-off-by Kyle Zeng <[email protected]>
Thanks for the fix.
Using sock_rmem_free() is a bit tricky here, especially in the general path, so I think it would be better to get rid of this unreliable way of checking.
My take on this is: since it's only caused in the AF_PACKET scenario, how about only handling this like removing the ongoing flag in the packet_rcv() path instead of touching the general function (which is skb_is_err_queue())?
Thanks,
Jason
Quoted 68 lines
--- include/net/sock.h | 1 + net/core/skbuff.c | 6 +++--- net/socket.c | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-)include/net/sock.h +1
-0@@ -1856,6 +1856,7 @@ struct sk_buff *sock_omalloc(struct sock *sk, unsigned long size, gfp_t priority);void skb_orphan_partial (struct sk_buff *skb);void sock_rfree (struct sk_buff *skb); +void sock_rmem_free (struct sk_buff *skb);void sock_efree (struct sk_buff *skb);#ifdef CONFIG_INET void sock_edemux (struct sk_buff *skb);net/core/skbuff.c +3
-3@@ -5450,7 +5450,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer) }EXPORT_SYMBOL_GPL (skb_cow_data); -static void sock_rmem_free (struct sk_buff *skb) +void sock_rmem_free (struct sk_buff *skb) {struct sock *sk = skb->sk;@@ -5459,8 +5459,8 @@ static void sock_rmem_free(struct sk_buff *skb)static void skb_set_err_queue (struct sk_buff *skb) { -/* pkt_type of skbs received on local sockets is never PACKET_OUTGOING. -* So, it is safe to (mis)use it to mark skbs on the error queue. +/* The error-queue test in skb_is_err_queue() matches this marker +* with the sock_rmem_free destructor installed by sock_queue_err_skb(). */ skb->pkt_type =PACKET_OUTGOING ;BUILD_BUG_ON (PACKET_OUTGOING ==0 );net/socket.c +6
-6@@ -852,12 +852,13 @@ EXPORT_SYMBOL(kernel_sendmsg);static bool skb_is_err_queue (const struct sk_buff *skb) { -/* pkt_type of skbs enqueued on the error queue are set to -* PACKET_OUTGOING in skb_set_err_queue(). This is only safe to do -* in recvmsg, since skbs received on a local socket will never -* have a pkt_type of PACKET_OUTGOING. +/* Error-queue skbs are marked as PACKET_OUTGOING in +* skb_set_err_queue() and use the destructor installed by +* sock_queue_err_skb(). PACKET_OUTGOING alone is not unique: +* AF_PACKET outgoing taps use the same pkt_type. */ -return skb->pkt_type ==PACKET_OUTGOING ; +return skb->pkt_type ==PACKET_OUTGOING && + skb->destructor == sock_rmem_free; }/* On transmit, software and hardware timestamps are returned independently. -- 2.43.0
Quoted 21 lines · Kyle Zeng
skb_is_err_queue()treatsPACKET_OUTGOINGas the sole marker for an skb fromsk_error_queue. That assumption is not true forAF_PACKETsockets:
outgoing packet taps are also delivered to packet sockets withskb->pkt_type==PACKET_OUTGOING, but theirskb->cbis owned byAF_PACKETinstead of structsock_exterr_skb.If such an skb is received with timestamping enabled, the generic timestamp cmsg path can read
AF_PACKETcontrol-buffer state assock_exterr_skb::opt_stats. WithSO_RXQ_OVFLenabled, the packet drop counter overlapsopt_stats. An odd drop count makes the path emitSCM_TIMESTAMPING_OPT_STATSwithskb->lenandskb->data. For non-linear skbs this copies past the linear head and can trigger hardened usercopy or disclose adjacent heap contents.Keep
skb_is_err_queue()local tonet/socket.c, but make it verify that thePACKET_OUTGOINGmarker is paired with thesock_rmem_freedestructor installed bysock_queue_err_skb().AF_PACKETreceive skbs use normal receive ownership and no longer pass as error-queue skbs, while legitimatesk_error_queueentries keep thePACKET_OUTGOINGmarker andsock_rmem_freeownership.
Quoted 2 lines
Fixes 8605330aac5a ("tcp: fix SCM_TIMESTAMPING_OPT_STATS for normal skbs")Signed-off-by Kyle Zeng <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 14 lines · On Sat, 6 Jun 2026 19:18:19 -0700 you wrote:
skb_is_err_queue()treatsPACKET_OUTGOINGas the sole marker for an skb fromsk_error_queue. That assumption is not true forAF_PACKETsockets:
outgoing packet taps are also delivered to packet sockets withskb->pkt_type==PACKET_OUTGOING, but theirskb->cbis owned byAF_PACKETinstead of structsock_exterr_skb.If such an skb is received with timestamping enabled, the generic timestamp cmsg path can read
AF_PACKETcontrol-buffer state assock_exterr_skb::opt_stats. WithSO_RXQ_OVFLenabled, the packet drop counter overlapsopt_stats. An odd drop count makes the path emitSCM_TIMESTAMPING_OPT_STATSwithskb->lenandskb->data. For non-linear skbs this copies past the linear head and can trigger hardened usercopy or disclose adjacent heap contents.
Quoted 1 line
[...]
Here is the summary with links:
- [net] net: guard timestamp cmsgs to real error queue skbs
https://git.kernel.org/netdev/net/c/1ee90b77b727
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html