projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull trivial1 into release branch
[powerpc.git]
/
net
/
ipv4
/
netfilter
/
nf_conntrack_l3proto_ipv4.c
diff --git
a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index
5bc9f64
..
77d9744
100644
(file)
--- a/
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@
-348,6
+348,7
@@
getorigdst(struct sock *sk, int optval, void __user *user, int *len)
.tuple.dst.u.tcp.port;
sin.sin_addr.s_addr = ct->tuplehash[IP_CT_DIR_ORIGINAL]
.tuple.dst.u3.ip;
+ memset(sin.sin_zero, 0, sizeof(sin.sin_zero));
DEBUGP("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",
NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));