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

Commit 124d37e9 authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

arp: allow arp processing to honor per interface arp_accept sysctl 



I found recently that the arp_process function which handles all of our received
arp frames, is using IPV4_DEVCONF_ALL macro to check the state of the arp_process
flag.  This seems wrong, as it implies that either none or all of the network
interfaces accept gratuitous arps.  This patch corrects that, allowing
per-interface arp_accept configuration to deviate from the all setting.  Note
this also brings us into line with the way the arp_filter setting is handled
during arp_process execution.

Tested this myself on my home network, and confirmed it works as expected.

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1aa9bc5b

include/linux/inetdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) 
	  IN_DEV_ORCONF((in_dev), ACCEPT_REDIRECTS)))



#define IN_DEV_ARPFILTER(in_dev)	IN_DEV_ORCONF((in_dev), ARPFILTER)

#define IN_DEV_ARP_ACCEPT(in_dev)	IN_DEV_ORCONF((in_dev), ARP_ACCEPT)

#define IN_DEV_ARP_ANNOUNCE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_ANNOUNCE)

#define IN_DEV_ARP_IGNORE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_IGNORE)

#define IN_DEV_ARP_NOTIFY(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)

net/ipv4/arp.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static int arp_process(struct sk_buff *skb) 


	n = __neigh_lookup(&arp_tbl, &sip, dev, 0);



	if (IPV4_DEVCONF_ALL(dev_net(dev), ARP_ACCEPT)) {

	if (IN_DEV_ARP_ACCEPT(in_dev)) {

		/* Unsolicited ARP is not accepted by default.

		   It is possible, that this option should be enabled for some

		   devices (strip is candidate)