Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc37c1ad authored by Liping Zhang's avatar Liping Zhang Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_log: fix snaplen does not truncate packets 



There's a similar problem in xt_NFLOG, and was fixed by commit 7643507f
("netfilter: xt_NFLOG: nflog-range does not truncate packets"). Only set
copy_len here does not work, so we should enable NF_LOG_F_COPY_LEN also.

Signed-off-by: default avatarLiping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1bc4e013

net/netfilter/nft_log.c

+2 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ static int nft_log_init(const struct nft_ctx *ctx, 
	case NF_LOG_TYPE_ULOG:

		li->u.ulog.group = ntohs(nla_get_be16(tb[NFTA_LOG_GROUP]));

		if (tb[NFTA_LOG_SNAPLEN] != NULL) {

			li->u.ulog.flags |= NF_LOG_F_COPY_LEN;

			li->u.ulog.copy_len =

				ntohl(nla_get_be32(tb[NFTA_LOG_SNAPLEN]));

		}
@@ -149,7 +150,7 @@ static int nft_log_dump(struct sk_buff *skb, const struct nft_expr *expr) 
		if (nla_put_be16(skb, NFTA_LOG_GROUP, htons(li->u.ulog.group)))

			goto nla_put_failure;



		if (li->u.ulog.copy_len) {

		if (li->u.ulog.flags & NF_LOG_F_COPY_LEN) {

			if (nla_put_be32(skb, NFTA_LOG_SNAPLEN,

					 htonl(li->u.ulog.copy_len)))

				goto nla_put_failure;