Merge remote-tracking branch 'aosp/main' into HEAD

* aosp/main:
  macsec: fix off-by-one when parsing attributes
  Fix duplicate symbols error in external/iproute2
  Move OWNER reference master=>main.
  [NFC] Move MTE mode settings to a product variable.
  Specify which M4 to use with bison

Ignore-AOSP-First: this is a merge from AOSP
Bug: 305814576
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib548ce5bdc796d3efe8c462546bab0a02732da4b

5 files changed, 22 insertions, 25 deletions

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
     ],
 }
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/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]),
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..da087ff1 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 {
@@ -149,8 +155,4 @@ cc_binary {
 
     // This is a work around for b/18403920
     ldflags: ["-Wl,--no-gc-sections"],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }