commit b00c9c39 removed the label end_of_netlink_messages and 'return
table' statement, It causes the function virArpTableGet doesn't return
a proper virArpTable pointer.

How to reproduce:
 # virsh domiflist sles12sp3
Interface  Type       Source     Model       MAC
-------------------------------------------------------
vnet0      network    default    virtio      52:54:00:cd:02:e6

 # virsh domifaddr sles12sp3 --source arp
error: Failed to query for interfaces addresses
error: An error occurred, but the cause is unknown

It seems that the "if (nh->nlmsg_type == NLMSG_DONE)" statement won't be
meted. So this patch adds 'return table' when the iterations of nlmsghdr
for loop is over.

Signed-off-by: Lin Ma <lma@suse.com>
Reviewed-by: Chen Hanxiao <chenhanxiao@gmail.com>
---
 src/util/virarptable.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/util/virarptable.c b/src/util/virarptable.c
index 04a6f35571..217a960d5a 100644
--- a/src/util/virarptable.c
+++ b/src/util/virarptable.c
@@ -152,6 +152,8 @@ virArpTableGet(void)
         }
     }
 
+    return table;
+
  cleanup:
     virArpTableFree(table);
     return NULL;
-- 
2.15.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

$SUBJ:

s/virarptable/util/

On 09/13/2018 03:54 AM, Lin Ma wrote:
> commit b00c9c39 removed the label end_of_netlink_messages and 'return
> table' statement, It causes the function virArpTableGet doesn't return
> a proper virArpTable pointer.
> 
> How to reproduce:
>  # virsh domiflist sles12sp3
> Interface  Type       Source     Model       MAC
> -------------------------------------------------------
> vnet0      network    default    virtio      52:54:00:cd:02:e6
> 
>  # virsh domifaddr sles12sp3 --source arp
> error: Failed to query for interfaces addresses
> error: An error occurred, but the cause is unknown
> 
> It seems that the "if (nh->nlmsg_type == NLMSG_DONE)" statement won't be
> meted. So this patch adds 'return table' when the iterations of nlmsghdr
> for loop is over.
> 
> Signed-off-by: Lin Ma <lma@suse.com>
> Reviewed-by: Chen Hanxiao <chenhanxiao@gmail.com>
> ---
>  src/util/virarptable.c | 2 ++
>  1 file changed, 2 insertions(+)
> 

good catch, thanks -

Reviewed-by: John Ferlan <jferlan@redhat.com>

(and pushed)

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list