Skip to contentSkip to conversation

iproute2: fix broken get_prefix_1

PATCH New Joe Harvell 1 participant 1 message Mar 21, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iproute2: fix broken get_prefix_1

Fixes bug that causes a basic 'ip addr add' command to fail address due to the address prefix is incorrectly determined to be invalid.

I assume master must have some new change because this fix was needed for a basic 'ip addr add 10.0.3.1/24 dev dumbo label foo' command I pased in. In this case, 'family' passed into get_addr_1 two lines above is zero, causing get_addr_1 to detect the family from the address and populate the result in the family field in dst. But then instead of passing in the result, family (still 0) is passed in to af_bit_len. Without my change, the above command complains that 10.0.3.1/24 is not an address prefix. With the change it works fine as expected.

The following changes since commit 4612d04d6b8f07274bd5d0688f717ccc189499ad:

tc class: Show class names from file (2015-03-15 12:27:40 -0700)

are available in the git repository at:

[email protected]:jharvell/iproute2.git fix-broken-get_prefix_1

for you to fetch changes up to 50d23ac0379cc1371f1096a4c84d8c1573c0a00a:

Harvell <[email protected]> (2015-03-21 12:35:15 -0500)

----------------------------------------------------------------
Joe Harvell (2):
Fixing obvious error of passing in the wrong variable for the
family parameter of af_bit_len.

 lib/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/utils.c +1 -1
index 9cda268..0d08a86 100644
@@ -477,7 +477,7 @@ int get_prefix_1(inet_prefix *dst, char *arg, int family)
 
        err = get_addr_1(dst, arg, family);
        if (err == 0) {
-               dst->bitlen = af_bit_len(family);
+               dst->bitlen = af_bit_len(dst->family);
 
                if (slash) {
                        if (get_netmask(&plen, slash+1, 0)