1 files changed, 5 insertions, 2 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 9c220323f353..f11931c18381 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -801,8 +801,11 @@ static int arp_process(struct sk_buff *skb)
  *  cache.
  */
 
-        /* Special case: IPv4 duplicate address detection packet (RFC2131) */
-        if (sip == 0) {
+        /*
+         *  Special case: IPv4 duplicate address detection packet (RFC2131)
+         *  and Gratuitous ARP/ARP Announce. (RFC3927, Section 2.4)
+         */
+        if (sip == 0 || tip == sip) {
                 if (arp->ar_op == htons(ARPOP_REQUEST) &&
                     inet_addr_type(net, tip) == RTN_LOCAL &&
                     !arp_ignore(in_dev, sip, tip))