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

Commit 779994fa authored by Gao Feng's avatar Gao Feng Committed by Pablo Neira Ayuso
Browse files

netfilter: log: Check param to avoid overflow in nf_log_set 



The nf_log_set is an interface function, so it should do the strict sanity
check of parameters. Convert the return value of nf_log_set as int instead
of void. When the pf is invalid, return -EOPNOTSUPP.

Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3cb27991

include/net/netfilter/nf_log.h

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ struct nf_logger { 
int nf_log_register(u_int8_t pf, struct nf_logger *logger);

void nf_log_unregister(struct nf_logger *logger);



void nf_log_set(struct net *net, u_int8_t pf,

		const struct nf_logger *logger);

int nf_log_set(struct net *net, u_int8_t pf, const struct nf_logger *logger);

void nf_log_unset(struct net *net, const struct nf_logger *logger);



int nf_log_bind_pf(struct net *net, u_int8_t pf,

net/bridge/netfilter/nf_log_bridge.c

+1 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ static struct nf_logger nf_bridge_logger __read_mostly = { 


static int __net_init nf_log_bridge_net_init(struct net *net)

{

	nf_log_set(net, NFPROTO_BRIDGE, &nf_bridge_logger);

	return 0;

	return nf_log_set(net, NFPROTO_BRIDGE, &nf_bridge_logger);

}



static void __net_exit nf_log_bridge_net_exit(struct net *net)

net/ipv4/netfilter/nf_log_arp.c

+1 −2
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ static struct nf_logger nf_arp_logger __read_mostly = { 


static int __net_init nf_log_arp_net_init(struct net *net)

{

	nf_log_set(net, NFPROTO_ARP, &nf_arp_logger);

	return 0;

	return nf_log_set(net, NFPROTO_ARP, &nf_arp_logger);

}



static void __net_exit nf_log_arp_net_exit(struct net *net)

net/ipv4/netfilter/nf_log_ipv4.c

+1 −2
Original line number Diff line number Diff line
@@ -347,8 +347,7 @@ static struct nf_logger nf_ip_logger __read_mostly = { 


static int __net_init nf_log_ipv4_net_init(struct net *net)

{

	nf_log_set(net, NFPROTO_IPV4, &nf_ip_logger);

	return 0;

	return nf_log_set(net, NFPROTO_IPV4, &nf_ip_logger);

}



static void __net_exit nf_log_ipv4_net_exit(struct net *net)

net/ipv6/netfilter/nf_log_ipv6.c

+1 −2
Original line number Diff line number Diff line
@@ -379,8 +379,7 @@ static struct nf_logger nf_ip6_logger __read_mostly = { 


static int __net_init nf_log_ipv6_net_init(struct net *net)

{

	nf_log_set(net, NFPROTO_IPV6, &nf_ip6_logger);

	return 0;

	return nf_log_set(net, NFPROTO_IPV6, &nf_ip6_logger);

}



static void __net_exit nf_log_ipv6_net_exit(struct net *net)