Commit 0c878380 authored by Phil Sutter's avatar Phil Sutter Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_log_syslog: Don't ignore unknown protocols 



With netdev and bridge nfprotos, loggers may see arbitrary ethernet
frames. Print at least basic info like interfaces and MAC header data.

Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 39ab798f

net/netfilter/nf_log_syslog.c

+31 −0
Original line number Diff line number Diff line
@@ -894,6 +894,33 @@ static struct nf_logger nf_ip6_logger __read_mostly = { 
	.me		= THIS_MODULE,

};



static void nf_log_unknown_packet(struct net *net, u_int8_t pf,

				  unsigned int hooknum,

				  const struct sk_buff *skb,

				  const struct net_device *in,

				  const struct net_device *out,

				  const struct nf_loginfo *loginfo,

				  const char *prefix)

{

	struct nf_log_buf *m;



	/* FIXME: Disabled from containers until syslog ns is supported */

	if (!net_eq(net, &init_net) && !sysctl_nf_log_all_netns)

		return;



	m = nf_log_buf_open();



	if (!loginfo)

		loginfo = &default_loginfo;



	nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo,

				  prefix);



	dump_mac_header(m, loginfo, skb);



	nf_log_buf_close(m);

}



static void nf_log_netdev_packet(struct net *net, u_int8_t pf,

				 unsigned int hooknum,

				 const struct sk_buff *skb,
@@ -913,6 +940,10 @@ static void nf_log_netdev_packet(struct net *net, u_int8_t pf, 
	case htons(ETH_P_RARP):

		nf_log_arp_packet(net, pf, hooknum, skb, in, out, loginfo, prefix);

		break;

	default:

		nf_log_unknown_packet(net, pf, hooknum, skb,

				      in, out, loginfo, prefix);

		break;

	}

}