Don't segfault if we don't receive any address from rtnl_link_get_addr()

David Sommerseth · David Sommerseth · commit 94ff260f3a69 · 2010-12-21T18:30:50.000+01:00
The callback function for device link information was lacking a simple
check to avoid a SEGV in these situations.

Signed-off-by: David Sommerseth &lt;davids@redhat.com&gt;
diff --git a/python-ethtool/etherinfo.c b/python-ethtool/etherinfo.c
@@ -147,7 +147,7 @@ static void callback_nl_link(struct nl_object *obj, void *arg)
 	unsigned char *binaddr;
 	char hwaddr[130], *ptr;
 
-	if( (ethi == NULL) || (ethi->hwaddress != NULL) ) {
+	if( (ethi == NULL) || (ethi->hwaddress != NULL) || (addr == NULL) ) {
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ static void callback_nl_link(struct nl_object obj, void arg)`
`147`	`147`	`unsigned char *binaddr;`
`148`	`148`	`char hwaddr[130], *ptr;`
`149`	`149`
`150`		`- if( (ethi == NULL) \|\| (ethi->hwaddress != NULL) ) {`
	`150`	`+ if( (ethi == NULL) \|\| (ethi->hwaddress != NULL) \|\| (addr == NULL) ) {`
`151`	`151`	`return;`
`152`	`152`	`}`
`153`	`153`