From f802dbfadf575f00d02d0a6d420f2c303a402010 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Thu, 27 Apr 2023 18:24:07 +0200 Subject: Specify which M4 to use with bison Otherwise it'll attempt to use m4 from $PATH, which might not exist Test: m tc Change-Id: I8fb2117cd47aa53a0ea0eac91fab547ba2175a41 --- tc/Android.bp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tc/Android.bp b/tc/Android.bp index 1838acf7..9ff95619 100644 --- a/tc/Android.bp +++ b/tc/Android.bp @@ -41,18 +41,24 @@ genrule { genrule { name: "emp_ematch.yacc.c", - cmd: "$(location bison) -y --output=$(genDir)/emp_ematch.yacc.c $(in)", + cmd: "M4=$(location m4) $(location bison) -y --output=$(genDir)/emp_ematch.yacc.c $(in)", out: ["emp_ematch.yacc.c"], srcs: ["emp_ematch.y"], - tools: ["bison"], + tools: [ + "bison", + "m4", + ], } genrule { name: "emp_ematch.yacc.h", - cmd: "$(location bison) -y --defines=$(genDir)/emp_ematch.yacc.h --output=$(genDir)/emp_ematch.yacc.c $(in)", + cmd: "M4=$(location m4) $(location bison) -y --defines=$(genDir)/emp_ematch.yacc.h --output=$(genDir)/emp_ematch.yacc.c $(in)", out: ["emp_ematch.yacc.h"], srcs: ["emp_ematch.y"], - tools: ["bison"], + tools: [ + "bison", + "m4", + ], } cc_binary { -- cgit v1.2.3 From 3e200849dbc2d1f342d6a27339fe2524398ca8eb Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 7 Jun 2023 15:07:33 -0700 Subject: [NFC] Move MTE mode settings to a product variable. The default list of memtag targets found in build/make/target/product/memtag-common.mk Bug: 280343521 Test: no functional change Change-Id: I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d --- ip/Android.bp | 4 ---- misc/Android.bp | 4 ---- tc/Android.bp | 4 ---- 3 files changed, 12 deletions(-) diff --git a/ip/Android.bp b/ip/Android.bp index b40fc4a0..329f7fa1 100644 --- a/ip/Android.bp +++ b/ip/Android.bp @@ -116,8 +116,4 @@ cc_binary { "-Wl,-export-dynamic", "-Wl,--no-gc-sections", ], - - sanitize: { - memtag_heap: true, - }, } diff --git a/misc/Android.bp b/misc/Android.bp index 5b75c71a..05376189 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -30,8 +30,4 @@ cc_binary { ], ldflags: ["-Wl,-export-dynamic"], - - sanitize: { - memtag_heap: true, - }, } diff --git a/tc/Android.bp b/tc/Android.bp index 9ff95619..da087ff1 100644 --- a/tc/Android.bp +++ b/tc/Android.bp @@ -155,8 +155,4 @@ cc_binary { // This is a work around for b/18403920 ldflags: ["-Wl,--no-gc-sections"], - - sanitize: { - memtag_heap: true, - }, } -- cgit v1.2.3 From 55ba83ef49258cb059f7cb35d8a4f83e377978fc Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 7 Jun 2023 15:07:33 -0700 Subject: [NFC] Move MTE mode settings to a product variable. The default list of memtag targets found in build/make/target/product/memtag-common.mk Bug: 280343521 Test: no functional change Merged-In: I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d Change-Id: I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d (cherry picked from commit 3e200849dbc2d1f342d6a27339fe2524398ca8eb) --- ip/Android.bp | 4 ---- misc/Android.bp | 4 ---- tc/Android.bp | 4 ---- 3 files changed, 12 deletions(-) diff --git a/ip/Android.bp b/ip/Android.bp index b40fc4a0..329f7fa1 100644 --- a/ip/Android.bp +++ b/ip/Android.bp @@ -116,8 +116,4 @@ cc_binary { "-Wl,-export-dynamic", "-Wl,--no-gc-sections", ], - - sanitize: { - memtag_heap: true, - }, } diff --git a/misc/Android.bp b/misc/Android.bp index 5b75c71a..05376189 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -30,8 +30,4 @@ cc_binary { ], ldflags: ["-Wl,-export-dynamic"], - - sanitize: { - memtag_heap: true, - }, } diff --git a/tc/Android.bp b/tc/Android.bp index 1838acf7..ee84b8b9 100644 --- a/tc/Android.bp +++ b/tc/Android.bp @@ -149,8 +149,4 @@ cc_binary { // This is a work around for b/18403920 ldflags: ["-Wl,--no-gc-sections"], - - sanitize: { - memtag_heap: true, - }, } -- cgit v1.2.3 From 9063cb88c9a87b9c89c212ab1d5b2d09ea1cdc20 Mon Sep 17 00:00:00 2001 From: Sam Saccone Date: Tue, 18 Jul 2023 17:57:03 +0000 Subject: Move OWNER reference master=>main. BUG=b/291759353 Change-Id: I0b5483f81eaf4064101f125d0fffdfe56f8b3792 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 62c5737a..c24680e9 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,2 @@ set noparent -file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking +file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking -- cgit v1.2.3 From 02786fa2a357688cdff5ea8d38d943099e76192a Mon Sep 17 00:00:00 2001 From: zijunzhao Date: Thu, 20 Jul 2023 22:52:42 +0000 Subject: Fix duplicate symbols error in external/iproute2 Symbol filter and listen_all_nsid are duplicate when switch -fcommon to -fno-common. Keep the old default for this project until we get a fixed version from upstream. Upstream fix patch: https://github.com/shemminger/iproute2/commit/578cadcc68035943062d74507c3b7989741b353f https://github.com/shemminger/iproute2/commit/fa92d8cb09e6a254d26834a66e4645ece6662f1a Bug: b/151457797 Test: mm Change-Id: I916bb676f179354918d63b40175eebfcb3714513 --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index c9c79304..f804ef9b 100644 --- a/Android.bp +++ b/Android.bp @@ -87,5 +87,8 @@ cc_defaults { "-DNO_SHARED_LIBS", "-Dstrdupa(__S)=strcpy(alloca(strlen(__S) + 1), __S)", + "-fcommon", //ld.lld: error: duplicate symbol filter: external/iproute2/ip/ipmroute.c:53 and external/iproute2/ip/ipxfrm.c:44 + //ld.lld: error: duplicate symbol listen_all_nsid: external/iproute2/ip/ipmonitor.c:29 and external/iproute2/ip/xfrm_monitor.c:37 + //Fixed upstream so we enable -fcommon locally ], } -- cgit v1.2.3 From dd7a566af3396c256d4a895ccb34af9bb255f5b0 Mon Sep 17 00:00:00 2001 From: Sabrina Dubroca Date: Fri, 12 Oct 2018 17:34:12 +0200 Subject: macsec: fix off-by-one when parsing attributes I seem to have had a massive brainfart with uses of parse_rtattr_nested(). The rtattr* array must have MAX+1 elements, and the call to parse_rtattr_nested must have MAX as its bound. Let's fix those. Fixes: b26fc590ce62 ("ip: add MACsec support") Signed-off-by: Sabrina Dubroca Signed-off-by: Stephen Hemminger Bug: 299660996 (cherry picked from commit https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=9b45f8ec13b0d338c70ef0758f751c249be6c7f0) Change-Id: I4b892fdaf953959a5f98fbb99d1693a7006e5820 --- ip/ipmacsec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c index ecc371a5..d15f5cd4 100644 --- a/ip/ipmacsec.c +++ b/ip/ipmacsec.c @@ -653,7 +653,7 @@ static void print_txsc_stats(const char *prefix, struct rtattr *attr) if (!attr || show_stats == 0) return; - parse_rtattr_nested(stats, MACSEC_TXSC_STATS_ATTR_MAX + 1, attr); + parse_rtattr_nested(stats, MACSEC_TXSC_STATS_ATTR_MAX, attr); printf("%sstats:", prefix); for (i = 1; i < NUM_MACSEC_TXSC_STATS_ATTR; i++) { @@ -692,7 +692,7 @@ static void print_secy_stats(const char *prefix, struct rtattr *attr) if (!attr || show_stats == 0) return; - parse_rtattr_nested(stats, MACSEC_SECY_STATS_ATTR_MAX + 1, attr); + parse_rtattr_nested(stats, MACSEC_SECY_STATS_ATTR_MAX, attr); printf("%sstats:", prefix); for (i = 1; i < NUM_MACSEC_SECY_STATS_ATTR; i++) { @@ -728,7 +728,7 @@ static void print_rxsa_stats(const char *prefix, struct rtattr *attr) if (!attr || show_stats == 0) return; - parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX + 1, attr); + parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX, attr); printf("%s%s ", prefix, prefix); for (i = 1; i < NUM_MACSEC_SA_STATS_ATTR; i++) { @@ -760,7 +760,7 @@ static void print_txsa_stats(const char *prefix, struct rtattr *attr) if (!attr || show_stats == 0) return; - parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX + 1, attr); + parse_rtattr_nested(stats, MACSEC_SA_STATS_ATTR_MAX, attr); printf("%s%s %s %s\n", prefix, prefix, txsa_stats_names[MACSEC_SA_STATS_ATTR_OUT_PKTS_PROTECTED], txsa_stats_names[MACSEC_SA_STATS_ATTR_OUT_PKTS_ENCRYPTED]); @@ -790,7 +790,7 @@ static void print_tx_sc(const char *prefix, __u64 sci, __u8 encoding_sa, SPRINT_BUF(keyid); bool state; - parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX + 1, a); + parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX, a); state = rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_ACTIVE]); printf("%s%s%d: PN %u, state %s, key %s\n", prefix, prefix, rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_AN]), @@ -824,7 +824,7 @@ static void print_rxsc_stats(const char *prefix, struct rtattr *attr) if (!attr || show_stats == 0) return; - parse_rtattr_nested(stats, MACSEC_RXSC_STATS_ATTR_MAX + 1, attr); + parse_rtattr_nested(stats, MACSEC_RXSC_STATS_ATTR_MAX, attr); printf("%sstats:", prefix); for (i = 1; i < NUM_MACSEC_RXSC_STATS_ATTR; i++) { if (!rxsc_stats_names[i]) @@ -859,7 +859,7 @@ static void print_rx_sc(const char *prefix, __u64 sci, __u8 active, SPRINT_BUF(keyid); bool state; - parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX + 1, a); + parse_rtattr_nested(sa_attr, MACSEC_SA_ATTR_MAX, a); state = rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_ACTIVE]); printf("%s%s%d: PN %u, state %s, key %s\n", prefix, prefix, rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_AN]), @@ -902,7 +902,7 @@ static int process(const struct sockaddr_nl *who, struct nlmsghdr *n, } ifindex = rta_getattr_u32(attrs[MACSEC_ATTR_IFINDEX]); - parse_rtattr_nested(attrs_secy, MACSEC_SECY_ATTR_MAX + 1, + parse_rtattr_nested(attrs_secy, MACSEC_SECY_ATTR_MAX, attrs[MACSEC_ATTR_SECY]); if (!validate_secy_dump(attrs_secy)) { @@ -935,7 +935,7 @@ static int process(const struct sockaddr_nl *who, struct nlmsghdr *n, for (c = RTA_DATA(sc); RTA_OK(c, rem); c = RTA_NEXT(c, rem)) { struct rtattr *sc_attr[MACSEC_RXSC_ATTR_MAX + 1]; - parse_rtattr_nested(sc_attr, MACSEC_RXSC_ATTR_MAX + 1, c); + parse_rtattr_nested(sc_attr, MACSEC_RXSC_ATTR_MAX, c); print_rx_sc(" ", rta_getattr_u64(sc_attr[MACSEC_RXSC_ATTR_SCI]), rta_getattr_u32(sc_attr[MACSEC_RXSC_ATTR_ACTIVE]), -- cgit v1.2.3 From 41d4d25f0c5d7634bb6e76e07e97cfaf759b7d7b Mon Sep 17 00:00:00 2001 From: Sam Saccone Date: Tue, 18 Jul 2023 17:57:03 +0000 Subject: Move OWNER reference master=>main. BUG=b/291759353 (cherry picked from https://android-review.googlesource.com/q/commit:9063cb88c9a87b9c89c212ab1d5b2d09ea1cdc20) Merged-In: I0b5483f81eaf4064101f125d0fffdfe56f8b3792 Change-Id: I0b5483f81eaf4064101f125d0fffdfe56f8b3792 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 62c5737a..c24680e9 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,2 @@ set noparent -file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking +file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking -- cgit v1.2.3