1 files changed, 8 insertions, 0 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index c6bd0f7a020a..c5ebfa199794 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -62,6 +62,11 @@
 #include <net/net_namespace.h>
 #include <net/addrconf.h>
 
+#define IPV6ONLY_FLAGS  \
+                (IFA_F_NODAD | IFA_F_OPTIMISTIC | IFA_F_DADFAILED | \
+                 IFA_F_HOMEADDRESS | IFA_F_TENTATIVE | \
+                 IFA_F_MANAGETEMPADDR | IFA_F_STABLE_PRIVACY)
+
 static struct ipv4_devconf ipv4_devconf = {
         .data = {
                 [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
@@ -468,6 +473,9 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
         ifa->ifa_flags &= ~IFA_F_SECONDARY;
         last_primary = &in_dev->ifa_list;
 
+        /* Don't set IPv6 only flags to IPv4 addresses */
+        ifa->ifa_flags &= ~IPV6ONLY_FLAGS;
+
         for (ifap = &in_dev->ifa_list; (ifa1 = *ifap) != NULL;
              ifap = &ifa1->ifa_next) {
                 if (!(ifa1->ifa_flags & IFA_F_SECONDARY) &&