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