netfilter: nf_queue: do not allow packet truncation below transport header offset
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 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 7af4cc3fa158 ("[NETFILTER]: Add "nfnetlink_queue" netfilter queue handler over nfnetlink")
Reported-by Domingo Dirutigliano <[email protected]>
Signed-off-by Florian Westphal <[email protected]>
--- net/netfilter/nfnetlink_queue.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink_queue.c +6 -1
@@ -843,11 +843,16 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) }static int -nfqnl_mangle (void *data,int data_len,struct nf_queue_entry *e,int diff) +nfqnl_mangle (void *data,unsigned int data_len,struct nf_queue_entry *e,int diff) {struct sk_buff *nskb;if (diff <0 ) { +unsigned int min_len =skb_transport_offset (e->skb); + +if (data_len < min_len) +return -EINVAL ; +if (pskb_trim (e->skb, data_len))return -ENOMEM ; }else if (diff >0 ) {
Signature · 1 line
2.35.1
Quoted 11 lines · Florian Westphal
Domingo Dirutigliano and Nicola Guerrera report kernel panic when sending
nf_queueverdict with 1-bytenfta_payloadattribute.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 7af4cc3fa158 ("[NETFILTER]: Add "nfnetlink_queue" netfilter queue handler over nfnetlink")Reported-by Domingo Dirutigliano <[email protected]>
Reviewed-by Pablo Neira Ayuso <[email protected]>
Quoted 1 line
Signed-off-by Florian Westphal <[email protected]>