| Message ID | 20171001031840.1252538-1-hex@fb.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [v2,iproute2] tc: fix ipv6 filter selector attribute for some prefix lengths | expand |
On Sat, 30 Sep 2017 20:18:40 -0700 Yulia Kartseva <hex@fb.com> wrote: > Wrong TCA_U32_SEL attribute packing if prefixLen AND 0x1f equals 0x1f. > These are /31, /63, /95 and /127 prefix lengths. > > Example: > ip6 dst face:b00f::/31 > filter parent b: protocol ipv6 pref 2307 u32 > filter parent b: protocol ipv6 pref 2307 u32 fh 800: ht divisor 1 > filter parent b: protocol ipv6 pref 2307 u32 fh 800::800 order 2048 > key ht 800 bkt 0 > match faceb00f/ffffffff at 24 > > v2: previous patch was made with a wrong repo > > Signed-off-by: Yulia Kartseva <hex@fb.com> That came through correctly. Applied.
diff --git a/tc/f_u32.c b/tc/f_u32.c index 5815be9..14b9588 100644 --- a/tc/f_u32.c +++ b/tc/f_u32.c @@ -385,8 +385,7 @@ static int parse_ip6_addr(int *argc_p, char ***argv_p, plen = addr.bitlen; for (i = 0; i < plen; i += 32) { - /* if (((i + 31) & ~0x1F) <= plen) { */ - if (i + 31 <= plen) { + if (i + 31 < plen) { res = pack_key(sel, addr.data[i / 32], 0xFFFFFFFF, off + 4 * (i / 32), offmask); if (res < 0)
Wrong TCA_U32_SEL attribute packing if prefixLen AND 0x1f equals 0x1f. These are /31, /63, /95 and /127 prefix lengths. Example: ip6 dst face:b00f::/31 filter parent b: protocol ipv6 pref 2307 u32 filter parent b: protocol ipv6 pref 2307 u32 fh 800: ht divisor 1 filter parent b: protocol ipv6 pref 2307 u32 fh 800::800 order 2048 key ht 800 bkt 0 match faceb00f/ffffffff at 24 v2: previous patch was made with a wrong repo Signed-off-by: Yulia Kartseva <hex@fb.com> --- tc/f_u32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)