Patch "netfilter: nft_log: restrict the log prefix length to 127" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
netfilter: nft_log: restrict the log prefix length to 127
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-nft_log-restrict-the-log-prefix-length-to-127.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Jun 15 16:35:05 CEST 2017
From: Liping Zhang <[email protected]>
Date: Sun, 22 Jan 2017 22:10:32 +0800
Subject: netfilter: nft_log: restrict the log prefix length to 127
From: Liping Zhang <[email protected]>
[ Upstream commit 5ce6b04ce96896e8a79e6f60740ced911eaac7a4 ]
First, log prefix will be truncated to NF_LOG_PREFIXLEN-1, i.e. 127, at nf_log_packet(), so the extra part is useless.
Second, after adding a log rule with a very very long prefix, we will fail to dump the nft rules after this _special_ one, but acctually, they do exist. For example:
# name_65000=$(printf "%0.sQ" {1..65000})
# nft add rule filter output log prefix "$name_65000"
# nft add rule filter output counter
# nft add rule filter output counter
# nft list chain filter output
table ip filter {
chain output {
type filter hook output priority 0; policy accept;
}
}So now, restrict the log prefix length to NF_LOG_PREFIXLEN-1.
--- include/uapi/linux/netfilter/nf_log.h | 2 ++ net/netfilter/nf_log.c | 1 - net/netfilter/nft_log.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-)
include/uapi/linux/netfilter/nf_log.h +2 -0
@@ -9,4 +9,6 @@#define NF_LOG_MACDECODE 0x20/* Decode MAC header */ #define NF_LOG_MASK 0x2f +#define NF_LOG_PREFIXLEN 128 +#endif /* _NETFILTER_NF_LOG_H */
net/netfilter/nf_log.c +0 -1
@@ -13,7 +13,6 @@/* Internal logging interface, which relies on the real LOG target modules */ -#define NF_LOG_PREFIXLEN 128#define NFLOGGER_NAME_LEN 64static struct nf_logger __rcu *loggers[NFPROTO_NUMPROTO ][NF_LOG_TYPE_MAX ]__read_mostly ;
net/netfilter/nft_log.c +2 -1
@@ -38,7 +38,8 @@ static void nft_log_eval(const struct nfstatic const struct nla_policy nft_log_policy[NFTA_LOG_MAX +1 ] = { [NFTA_LOG_GROUP ] = { .type =NLA_U16 }, - [NFTA_LOG_PREFIX ] = { .type =NLA_STRING }, + [NFTA_LOG_PREFIX ] = { .type =NLA_STRING , + .len =NF_LOG_PREFIXLEN -1 }, [NFTA_LOG_SNAPLEN ] = { .type =NLA_U32 }, [NFTA_LOG_QTHRESHOLD ] = { .type =NLA_U16 }, [NFTA_LOG_LEVEL ] = { .type =NLA_U32 },
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/netfilter-nft_log-restrict-the-log-prefix-length-to-127.patch