Skip to content

Commit 99a63d3

Browse files
author
Florian Westphal
committed
netfilter: nf_queue: do not allow packet truncation below transport header offset
Domingo Dirutigliano and Nicola Guerrera report kernel panic when sending nf_queue verdict with 1-byte nfta_payload attribute. The IP/IPv6 stack pulls the IP(v6) header from the packet after the input hook. If user truncates the packet below the header size, this skb_pull() will result in a malformed skb (skb->len < 0). Fixes: 7af4cc3 ("[NETFILTER]: Add "nfnetlink_queue" netfilter queue handler over nfnetlink") Reported-by: Domingo Dirutigliano <pwnzer0tt1@proton.me> Signed-off-by: Florian Westphal <fw@strlen.de> Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 9b134b1 commit 99a63d3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

net/netfilter/nfnetlink_queue.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,11 +843,16 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
843843
}
844844

845845
static int
846-
nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e, int diff)
846+
nfqnl_mangle(void *data, unsigned int data_len, struct nf_queue_entry *e, int diff)
847847
{
848848
struct sk_buff *nskb;
849849

850850
if (diff < 0) {
851+
unsigned int min_len = skb_transport_offset(e->skb);
852+
853+
if (data_len < min_len)
854+
return -EINVAL;
855+
851856
if (pskb_trim(e->skb, data_len))
852857
return -ENOMEM;
853858
} else if (diff > 0) {

0 commit comments

Comments
 (0)