batman-adv/patches/0010-batman-adv-initialize-struct-batadv_tvlv_tt_vlan_dat.patch

   1 From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
   2 Date: Mon, 5 Apr 2021 19:16:50 +0900
   3 Subject: batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field
   4
   5 KMSAN found uninitialized value at batadv_tt_prepare_tvlv_local_data()
   6 [1], for commit ced72933a5e8ab52 ("batman-adv: use CRC32C instead of CRC16
   7 in TT code") inserted 'reserved' field into "struct batadv_tvlv_tt_data"
   8 and commit 7ea7b4a142758dea ("batman-adv: make the TT CRC logic VLAN
   9 specific") moved that field to "struct batadv_tvlv_tt_vlan_data" but left
  10 that field uninitialized.
  11
  12 [1] https://syzkaller.appspot.com/bug?id=07f3e6dba96f0eb3cabab986adcd8a58b9bdbe9d
  13
  14 Reported-by: syzbot <syzbot+50ee810676e6a089487b@syzkaller.appspotmail.com>
  15 Tested-by: syzbot <syzbot+50ee810676e6a089487b@syzkaller.appspotmail.com>
  16 Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
  17 Fixes: c5e7a06a2961 ("batman-adv: use CRC32C instead of CRC16 in TT code")
  18 Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
  19 Signed-off-by: Sven Eckelmann <sven@narfation.org>
  20 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/fe8bf38f47a0c1a0e53c487228e3f5a44c86939f
  21
  22 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
  23 index 8a482c5ec67bb22167bca02b4181252045e3b605..c5271ea4dc8321fadc75fca7790b1382102dbb5a 100644
  24 --- a/net/batman-adv/translation-table.c
  25 +++ b/net/batman-adv/translation-table.c
  26 @@ -891,6 +891,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,
  27         hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) {
  28                 tt_vlan->vid = htons(vlan->vid);
  29                 tt_vlan->crc = htonl(vlan->tt.crc);
  30 +               tt_vlan->reserved = 0;
  31
  32                 tt_vlan++;
  33         }
  34 @@ -974,6 +975,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,
  35
  36                 tt_vlan->vid = htons(vlan->vid);
  37                 tt_vlan->crc = htonl(vlan->tt.crc);
  38 +               tt_vlan->reserved = 0;
  39
  40                 tt_vlan++;
  41         }