From 3f06277b9207ef91601e79382a681944939f1af6 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 14 May 2021 19:18:33 +0200 Subject: [PATCH 1/4] batman-adv: use $(AUTORELEASE) for PKG_RELEASE Use `$(AUTORELEASE)` variable rather than setting a PKG_RELEASE on every commit manually. Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 5c058bd..050b352 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2021.0 -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) From 7f513574e48a3c7029f7db512c187c0dd1878a73 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 14 May 2021 19:18:50 +0200 Subject: [PATCH 2/4] batctl: use $(AUTORELEASE) for PKG_RELEASE Use `$(AUTORELEASE)` variable rather than setting a PKG_RELEASE on every commit manually. Signed-off-by: Sven Eckelmann --- batctl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batctl/Makefile b/batctl/Makefile index 47e6a31..ea86720 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2021.0 -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) From e7ea594077f31cd991ea7316845eb71885360fab Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 14 May 2021 19:19:00 +0200 Subject: [PATCH 3/4] alfred: use $(AUTORELEASE) for PKG_RELEASE Use `$(AUTORELEASE)` variable rather than setting a PKG_RELEASE on every commit manually. Signed-off-by: Sven Eckelmann --- alfred/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfred/Makefile b/alfred/Makefile index 8ab26e1..7e25340 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred PKG_VERSION:=2021.0 -PKG_RELEASE:=3 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) From 9beb55d8fc3aa6f1a913ce1b3fa465581215d069 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 14 May 2021 20:54:45 +0200 Subject: [PATCH 4/4] batman-adv: Merge bugfixes from 2021.1 * initialize "struct batadv_tvlv_tt_vlan_data"->reserved field Signed-off-by: Sven Eckelmann --- ...alize-struct-batadv_tvlv_tt_vlan_dat.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 batman-adv/patches/0003-batman-adv-initialize-struct-batadv_tvlv_tt_vlan_dat.patch diff --git a/batman-adv/patches/0003-batman-adv-initialize-struct-batadv_tvlv_tt_vlan_dat.patch b/batman-adv/patches/0003-batman-adv-initialize-struct-batadv_tvlv_tt_vlan_dat.patch new file mode 100644 index 0000000..0444640 --- /dev/null +++ b/batman-adv/patches/0003-batman-adv-initialize-struct-batadv_tvlv_tt_vlan_dat.patch @@ -0,0 +1,41 @@ +From: Tetsuo Handa +Date: Mon, 5 Apr 2021 19:16:50 +0900 +Subject: batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field + +KMSAN found uninitialized value at batadv_tt_prepare_tvlv_local_data() +[1], for commit ced72933a5e8ab52 ("batman-adv: use CRC32C instead of CRC16 +in TT code") inserted 'reserved' field into "struct batadv_tvlv_tt_data" +and commit 7ea7b4a142758dea ("batman-adv: make the TT CRC logic VLAN +specific") moved that field to "struct batadv_tvlv_tt_vlan_data" but left +that field uninitialized. + +[1] https://syzkaller.appspot.com/bug?id=07f3e6dba96f0eb3cabab986adcd8a58b9bdbe9d + +Reported-by: syzbot +Tested-by: syzbot +Signed-off-by: Tetsuo Handa +Fixes: c5e7a06a2961 ("batman-adv: use CRC32C instead of CRC16 in TT code") +Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific") +Signed-off-by: Sven Eckelmann +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/fe8bf38f47a0c1a0e53c487228e3f5a44c86939f + +diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c +index cd09916f97fe97a1139b01cf3859e45140e927b6..0e32e31872e29a6d50f0020c9af62b44e86a72e4 100644 +--- a/net/batman-adv/translation-table.c ++++ b/net/batman-adv/translation-table.c +@@ -890,6 +890,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, + hlist_for_each_entry(vlan, &orig_node->vlan_list, list) { + tt_vlan->vid = htons(vlan->vid); + tt_vlan->crc = htonl(vlan->tt.crc); ++ tt_vlan->reserved = 0; + + tt_vlan++; + } +@@ -973,6 +974,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, + + tt_vlan->vid = htons(vlan->vid); + tt_vlan->crc = htonl(vlan->tt.crc); ++ tt_vlan->reserved = 0; + + tt_vlan++; + }