diff options
| author | Andrei Vagin | 2019-04-17 18:49:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-16 19:41:24 +0200 |
| commit | 3a53fa469d6001dc41ab9ef0dc909287d67ab716 (patch) | |
| tree | edeeebf4f655ed69e9868053ae7bed2bd22cf0b2 /net/netfilter | |
| parent | selftests/net: correct the return value for run_netsocktests (diff) | |
| download | kernel-qcow2-linux-3a53fa469d6001dc41ab9ef0dc909287d67ab716.tar.gz kernel-qcow2-linux-3a53fa469d6001dc41ab9ef0dc909287d67ab716.tar.xz kernel-qcow2-linux-3a53fa469d6001dc41ab9ef0dc909287d67ab716.zip | |
netfilter: fix nf_l4proto_log_invalid to log invalid packets
[ Upstream commit d48668052b2603b6262459625c86108c493588dd ]
It doesn't log a packet if sysctl_log_invalid isn't equal to protonum
OR sysctl_log_invalid isn't equal to IPPROTO_RAW. This sentence is
always true. I believe we need to replace OR to AND.
Cc: Florian Westphal <fw@strlen.de>
Fixes: c4f3db1595827 ("netfilter: conntrack: add and use nf_l4proto_log_invalid")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 51c5d7eec0a3..e903ef9b96cf 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -86,7 +86,7 @@ void nf_l4proto_log_invalid(const struct sk_buff *skb, struct va_format vaf; va_list args; - if (net->ct.sysctl_log_invalid != protonum || + if (net->ct.sysctl_log_invalid != protonum && net->ct.sysctl_log_invalid != IPPROTO_RAW) return; |