netfilter: nf_conntrack_h323: lost .data_len definition for Q.931/ipv6

Could you please push this patch into stable@?
it fixes memory corruption in kernels  v3.5 .. v4.10

Lost .data_len definition leads to write beyond end of
struct nf_ct_h323_master. Usually it corrupts following
struct nf_conn_nat, however if nat is not loaded it corrupts
following slab object.

In mainline this problem went away in v4.11,
after commit 9f0f3ebeda ("netfilter: helpers: remove data_len usage
for inkernel helpers") however many stable kernels are still affected.

Fixes: 1afc56794e ("netfilter: nf_ct_helper: implement variable length helper private data") # v3.5
cc: stable@vger.kernel.org
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ib717c2eadf6e8ed6f0334793ad8028069b7f4f7b
Git-commit: 396ba2fc4f27ef6c44bbc0098bfddf4da76dc4c9
Git-repo: https://android.googlesource.com/kernel/msm
Signed-off-by: Uppala Revanth Kumar <urevanth@codeaurora.org>
tirimbino
Vasily Averin 5 years ago committed by Gerrit - the friendly Code Review server
parent 2fbc961fbe
commit 6edf689b31
  1. 1
      net/netfilter/nf_conntrack_h323_main.c

@ -1223,6 +1223,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_q931[] __read_mostly = {
{
.name = "Q.931",
.me = THIS_MODULE,
.data_len = sizeof(struct nf_ct_h323_master),
.tuple.src.l3num = AF_INET6,
.tuple.src.u.tcp.port = cpu_to_be16(Q931_PORT),
.tuple.dst.protonum = IPPROTO_TCP,

Loading…
Cancel
Save