|
 |
930fb9 |
From 03525ec63a5821a30461047da1dc8d907b3e3751 Mon Sep 17 00:00:00 2001
|
|
|
930fb9 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
930fb9 |
Date: Thu, 18 Oct 2018 12:49:51 +0200
|
|
|
930fb9 |
Subject: [PATCH] macsec: fix off-by-one when parsing attributes
|
|
|
930fb9 |
|
|
|
930fb9 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1628428
|
|
|
930fb9 |
Upstream Status: iproute2.git commit 9b45f8ec13b0d
|
|
|
930fb9 |
|
|
|
930fb9 |
commit 9b45f8ec13b0d338c70ef0758f751c249be6c7f0
|
|
|
930fb9 |
Author: Sabrina Dubroca <sd@queasysnail.net>
|
|
|
930fb9 |
Date: Fri Oct 12 17:34:12 2018 +0200
|
|
|
930fb9 |
|
|
|
930fb9 |
macsec: fix off-by-one when parsing attributes
|
|
|
930fb9 |
|
|
|
930fb9 |
I seem to have had a massive brainfart with uses of
|
|
|
930fb9 |
parse_rtattr_nested(). The rtattr* array must have MAX+1 elements, and
|
|
|
930fb9 |
the call to parse_rtattr_nested must have MAX as its bound. Let's fix
|
|
|
930fb9 |
those.
|
|
|
930fb9 |
|
|
|
930fb9 |
Fixes: b26fc590ce62 ("ip: add MACsec support")
|
|
|
930fb9 |
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
|
|
|
930fb9 |
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
930fb9 |
---
|
|
|
930fb9 |
ip/ipmacsec.c | 18 +++++++++---------
|
|
|
930fb9 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
930fb9 |
|
|
|
930fb9 |
diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c
|
|
|
930fb9 |
index fa56e0e..007ce54 100644
|
|
|
930fb9 |
--- a/ip/ipmacsec.c
|
|
|
930fb9 |
+++ b/ip/ipmacsec.c
|
|
|
930fb9 |
@@ -727,7 +727,7 @@ static void print_txsc_stats(const char *prefix, struct rtattr *attr)
|
|
|
930fb9 |
if (!attr || show_stats == 0)
|
|
|
930fb9 |
return;
|
|
|
930fb9 |
|
|
|
930fb9 |
- parse_rtattr_nested(stats, MACSEC_TXSC_STATS_ATTR_MAX + 1, attr);
|
|
|
930fb9 |
+ parse_rtattr_nested(stats, MACSEC_TXSC_STATS_ATTR_MAX, attr);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_stats(prefix, txsc_stats_names, NUM_MACSEC_TXSC_STATS_ATTR,
|
|
|
930fb9 |
stats);
|
|
|
930fb9 |
@@ -751,7 +751,7 @@ static void print_secy_stats(const char *prefix, struct rtattr *attr)
|
|
|
930fb9 |
if (!attr || show_stats == 0)
|
|
|
930fb9 |
return;
|
|
|
930fb9 |
|
|
|
930fb9 |
- parse_rtattr_nested(stats, MACSEC_SECY_STATS_ATTR_MAX + 1, attr);
|
|
|
930fb9 |
+ parse_rtattr_nested(stats, MACSEC_SECY_STATS_ATTR_MAX, attr);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_stats(prefix, secy_stats_names,
|
|
|
930fb9 |
NUM_MACSEC_SECY_STATS_ATTR, stats);
|
|
|
930fb9 |
@@ -772,7 +772,7 @@ static void print_rxsa_stats(const char *prefix, struct rtattr *attr)
|
|
|
930fb9 |
if (!attr || show_stats == 0)
|
|
|
930fb9 |
return;
|
|
|
930fb9 |
|
|
|
930fb9 |
- parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX + 1, attr);
|
|
|
930fb9 |
+ parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX, attr);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_stats(prefix, rxsa_stats_names, NUM_MACSEC_SA_STATS_ATTR, stats);
|
|
|
930fb9 |
}
|
|
|
930fb9 |
@@ -789,7 +789,7 @@ static void print_txsa_stats(const char *prefix, struct rtattr *attr)
|
|
|
930fb9 |
if (!attr || show_stats == 0)
|
|
|
930fb9 |
return;
|
|
|
930fb9 |
|
|
|
930fb9 |
- parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX + 1, attr);
|
|
|
930fb9 |
+ parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX, attr);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_stats(prefix, txsa_stats_names, NUM_MACSEC_SA_STATS_ATTR, stats);
|
|
|
930fb9 |
}
|
|
|
930fb9 |
@@ -817,7 +817,7 @@ static void print_tx_sc(const char *prefix, __u64 sci, __u8 encoding_sa,
|
|
|
930fb9 |
bool state;
|
|
|
930fb9 |
|
|
|
930fb9 |
open_json_object(NULL);
|
|
|
930fb9 |
- parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX + 1, a);
|
|
|
930fb9 |
+ parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX, a);
|
|
|
930fb9 |
state = rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_ACTIVE]);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_string(PRINT_FP, NULL, "%s", prefix);
|
|
|
930fb9 |
@@ -858,7 +858,7 @@ static void print_rxsc_stats(const char *prefix, struct rtattr *attr)
|
|
|
930fb9 |
if (!attr || show_stats == 0)
|
|
|
930fb9 |
return;
|
|
|
930fb9 |
|
|
|
930fb9 |
- parse_rtattr_nested(stats, MACSEC_RXSC_STATS_ATTR_MAX + 1, attr);
|
|
|
930fb9 |
+ parse_rtattr_nested(stats, MACSEC_RXSC_STATS_ATTR_MAX, attr);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_stats(prefix, rxsc_stats_names,
|
|
|
930fb9 |
NUM_MACSEC_RXSC_STATS_ATTR, stats);
|
|
|
930fb9 |
@@ -885,7 +885,7 @@ static void print_rx_sc(const char *prefix, __be64 sci, __u8 active,
|
|
|
930fb9 |
bool state;
|
|
|
930fb9 |
|
|
|
930fb9 |
open_json_object(NULL);
|
|
|
930fb9 |
- parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX + 1, a);
|
|
|
930fb9 |
+ parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX, a);
|
|
|
930fb9 |
state = rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_ACTIVE]);
|
|
|
930fb9 |
|
|
|
930fb9 |
print_string(PRINT_FP, NULL, "%s", prefix);
|
|
|
930fb9 |
@@ -918,7 +918,7 @@ static void print_rxsc_list(struct rtattr *sc)
|
|
|
930fb9 |
|
|
|
930fb9 |
open_json_object(NULL);
|
|
|
930fb9 |
|
|
|
930fb9 |
- parse_rtattr_nested(sc_attr, MACSEC_RXSC_ATTR_MAX + 1, c);
|
|
|
930fb9 |
+ parse_rtattr_nested(sc_attr, MACSEC_RXSC_ATTR_MAX, c);
|
|
|
930fb9 |
print_rx_sc(" ",
|
|
|
930fb9 |
rta_getattr_u64(sc_attr[MACSEC_RXSC_ATTR_SCI]),
|
|
|
930fb9 |
rta_getattr_u32(sc_attr[MACSEC_RXSC_ATTR_ACTIVE]),
|
|
|
930fb9 |
@@ -958,7 +958,7 @@ static int process(const struct sockaddr_nl *who, struct nlmsghdr *n,
|
|
|
930fb9 |
}
|
|
|
930fb9 |
|
|
|
930fb9 |
ifindex = rta_getattr_u32(attrs[MACSEC_ATTR_IFINDEX]);
|
|
|
930fb9 |
- parse_rtattr_nested(attrs_secy, MACSEC_SECY_ATTR_MAX + 1,
|
|
|
930fb9 |
+ parse_rtattr_nested(attrs_secy, MACSEC_SECY_ATTR_MAX,
|
|
|
930fb9 |
attrs[MACSEC_ATTR_SECY]);
|
|
|
930fb9 |
|
|
|
930fb9 |
if (!validate_secy_dump(attrs_secy)) {
|
|
|
930fb9 |
--
|
|
|
930fb9 |
1.8.3.1
|
|
|
930fb9 |
|