Handle Mac address 'none' (sonic-net#2593)

prsunny · web-flow · commit 8a0bb3689b11 · 2023-01-04T18:58:55.000-08:00
In some rare cases, kernel neighbor add notifications are received with Mac string as 'none'. Fixing this to prevent crash.
diff --git a/neighsyncd/neighsync.cpp b/neighsyncd/neighsync.cpp
@@ -143,6 +143,12 @@ void NeighSync::onMsg(int nlmsg_type, struct nl_object *obj)
         nl_addr2str(rtnl_neigh_get_lladdr(neigh), macStr, MAX_ADDR_SIZE);
     }
 
+    if (!delete_key && !strncmp(macStr, "none", MAX_ADDR_SIZE))
+    {
+        SWSS_LOG_NOTICE("Mac address is 'none' for ADD op, ignoring for %s", ipStr);
+        return;
+    }
+
     /* Ignore neighbor entries with Broadcast Mac - Trigger for directed broadcast */
     if (!delete_key && (MacAddress(macStr) == MacAddress("ff:ff:ff:ff:ff:ff")))
     {

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,12 @@ void NeighSync::onMsg(int nlmsg_type, struct nl_object *obj)`
`143`	`143`	`nl_addr2str(rtnl_neigh_get_lladdr(neigh), macStr, MAX_ADDR_SIZE);`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ if (!delete_key && !strncmp(macStr, "none", MAX_ADDR_SIZE))`
	`147`	`+ {`
	`148`	`+ SWSS_LOG_NOTICE("Mac address is 'none' for ADD op, ignoring for %s", ipStr);`
	`149`	`+ return;`
	`150`	`+ }`
	`151`	`+`
`146`	`152`	`/* Ignore neighbor entries with Broadcast Mac - Trigger for directed broadcast */`
`147`	`153`	`if (!delete_key && (MacAddress(macStr) == MacAddress("ff:ff:ff:ff:ff:ff")))`
`148`	`154`	`{`