|
 |
930fb9 |
From fd07e443d264ddf25d4152af3a44144e1a9b3fd9 Mon Sep 17 00:00:00 2001
|
|
|
930fb9 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
930fb9 |
Date: Thu, 18 Oct 2018 10:52:51 +0200
|
|
|
930fb9 |
Subject: [PATCH] ip-addrlabel: Fix printing of label value
|
|
|
930fb9 |
|
|
|
930fb9 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1639412
|
|
|
930fb9 |
Upstream Status: iproute2.git commit 0b9b0d08c29f9
|
|
|
930fb9 |
|
|
|
930fb9 |
commit 0b9b0d08c29f9aa6cc1b83c853964d9cc18dc6f2
|
|
|
930fb9 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
930fb9 |
Date: Mon Oct 15 22:20:58 2018 +0200
|
|
|
930fb9 |
|
|
|
930fb9 |
ip-addrlabel: Fix printing of label value
|
|
|
930fb9 |
|
|
|
930fb9 |
Passing the return value of RTA_DATA() to rta_getattr_u32() is wrong
|
|
|
930fb9 |
since that function will call RTA_DATA() by itself already.
|
|
|
930fb9 |
|
|
|
930fb9 |
Fixes: a7ad1c8a6845d ("ipaddrlabel: add json support")
|
|
|
930fb9 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
930fb9 |
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
930fb9 |
---
|
|
|
930fb9 |
ip/ipaddrlabel.c | 2 +-
|
|
|
930fb9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
930fb9 |
|
|
|
930fb9 |
diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
|
|
|
930fb9 |
index 2f79c56..8abe572 100644
|
|
|
930fb9 |
--- a/ip/ipaddrlabel.c
|
|
|
930fb9 |
+++ b/ip/ipaddrlabel.c
|
|
|
930fb9 |
@@ -95,7 +95,7 @@ int print_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg
|
|
|
930fb9 |
}
|
|
|
930fb9 |
|
|
|
930fb9 |
if (tb[IFAL_LABEL] && RTA_PAYLOAD(tb[IFAL_LABEL]) == sizeof(uint32_t)) {
|
|
|
930fb9 |
- uint32_t label = rta_getattr_u32(RTA_DATA(tb[IFAL_LABEL]));
|
|
|
930fb9 |
+ uint32_t label = rta_getattr_u32(tb[IFAL_LABEL]);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_uint(PRINT_ANY,
|
|
|
930fb9 |
"label", "label %u ", label);
|
|
|
930fb9 |
--
|
|
|
930fb9 |
1.8.3.1
|
|
|
930fb9 |
|