]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
netfilter: nf_conntrack_dccp: fix skb_header_pointer API usages
authorDaniel Borkmann <dborkman@redhat.com>
Sun, 5 Jan 2014 23:57:54 +0000 (00:57 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 9 Apr 2014 01:20:44 +0000 (02:20 +0100)
commit5b866eaa34e4ddc312c927030fde5f6a6184ddc5
tree9a08a5be4bc675937ee58e92f3e36915b3cdfe2b
parent630176c5033a4ed19a0fc6608980344657ba69af
netfilter: nf_conntrack_dccp: fix skb_header_pointer API usages

commit b22f5126a24b3b2f15448c3f2a254fc10cbc2b92 upstream.

Some occurences in the netfilter tree use skb_header_pointer() in
the following way ...

  struct dccp_hdr _dh, *dh;
  ...
  skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);

... where dh itself is a pointer that is being passed as the copy
buffer. Instead, we need to use &_dh as the forth argument so that
we're copying the data into an actual buffer that sits on the stack.

Currently, we probably could overwrite memory on the stack (e.g.
with a possibly mal-formed DCCP packet), but unintentionally, as
we only want the buffer to be placed into _dh variable.

Fixes: 2bc780499aa3 ("[NETFILTER]: nf_conntrack: add DCCP protocol support")
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/netfilter/nf_conntrack_proto_dccp.c