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

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

netfilter: nft_log: complete NFTA_LOG_FLAGS attr support 



NFTA_LOG_FLAGS attribute is already supported, but the related
NF_LOG_XXX flags are not exposed to the userspace. So we cannot
explicitly enable log flags to log uid, tcp sequence, ip options
and so on, i.e. such rule "nft add rule filter output log uid"
is not supported yet.

So move NF_LOG_XXX macro definitions to the uapi/../nf_log.h. In
order to keep consistent with other modules, change NF_LOG_MASK to
refer to all supported log flags. On the other hand, add a new
NF_LOG_DEFAULT_MASK to refer to the original default log flags.

Finally, if user specify the unsupported log flags or NFTA_LOG_GROUP
and NFTA_LOG_FLAGS are set at the same time, report EINVAL to the
userspace.

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

include/net/netfilter/nf_log.h

+3 −8
Original line number Diff line number Diff line
@@ -2,15 +2,10 @@ 
#define _NF_LOG_H



#include <linux/netfilter.h>

#include <linux/netfilter/nf_log.h>



/* those NF_LOG_* defines and struct nf_loginfo are legacy definitios that will

 * disappear once iptables is replaced with pkttables.  Please DO NOT use them

 * for any new code! */

#define NF_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */

#define NF_LOG_TCPOPT		0x02	/* Log TCP options */

#define NF_LOG_IPOPT		0x04	/* Log IP options */

#define NF_LOG_UID		0x08	/* Log UID owning local socket */

#define NF_LOG_MASK		0x0f

/* Log tcp sequence, tcp options, ip options and uid owning local socket */

#define NF_LOG_DEFAULT_MASK	0x0f



/* This flag indicates that copy_len field in nf_loginfo is set */

#define NF_LOG_F_COPY_LEN	0x1

include/uapi/linux/netfilter/nf_log.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#ifndef _NETFILTER_NF_LOG_H

#define _NETFILTER_NF_LOG_H



#define NF_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */

#define NF_LOG_TCPOPT		0x02	/* Log TCP options */

#define NF_LOG_IPOPT		0x04	/* Log IP options */

#define NF_LOG_UID		0x08	/* Log UID owning local socket */

#define NF_LOG_NFLOG		0x10	/* Unsupported, don't reuse */

#define NF_LOG_MACDECODE	0x20	/* Decode MAC header */

#define NF_LOG_MASK		0x2f



#endif /* _NETFILTER_NF_LOG_H */

net/bridge/netfilter/ebt_log.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum, 
	if (loginfo->type == NF_LOG_TYPE_LOG)

		bitmask = loginfo->u.log.logflags;

	else

		bitmask = NF_LOG_MASK;

		bitmask = NF_LOG_DEFAULT_MASK;



	if ((bitmask & EBT_LOG_IP) && eth_hdr(skb)->h_proto ==

	   htons(ETH_P_IP)) {

net/ipv4/netfilter/ip_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static struct nf_loginfo trace_loginfo = { 
	.u = {

		.log = {

			.level = 4,

			.logflags = NF_LOG_MASK,

			.logflags = NF_LOG_DEFAULT_MASK,

		},

	},

};

net/ipv4/netfilter/nf_log_arp.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct nf_loginfo default_loginfo = { 
	.u = {

		.log = {

			.level	  = LOGLEVEL_NOTICE,

			.logflags = NF_LOG_MASK,

			.logflags = NF_LOG_DEFAULT_MASK,

		},

	},

};