releases/4.4.177/net-nfc-fix-null-dereference-on-nfc_llcp_build_tlv-fails.patch

   1 From foo@baz Fri Mar  8 10:00:48 CET 2019
   2 From: YueHaibing <yuehaibing@huawei.com>
   3 Date: Fri, 22 Feb 2019 15:37:58 +0800
   4 Subject: net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails
   5
   6 From: YueHaibing <yuehaibing@huawei.com>
   7
   8 [ Upstream commit 58bdd544e2933a21a51eecf17c3f5f94038261b5 ]
   9
  10 KASAN report this:
  11
  12 BUG: KASAN: null-ptr-deref in nfc_llcp_build_gb+0x37f/0x540 [nfc]
  13 Read of size 3 at addr 0000000000000000 by task syz-executor.0/5401
  14
  15 CPU: 0 PID: 5401 Comm: syz-executor.0 Not tainted 5.0.0-rc7+ #45
  16 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
  17 Call Trace:
  18  __dump_stack lib/dump_stack.c:77 [inline]
  19  dump_stack+0xfa/0x1ce lib/dump_stack.c:113
  20  kasan_report+0x171/0x18d mm/kasan/report.c:321
  21  memcpy+0x1f/0x50 mm/kasan/common.c:130
  22  nfc_llcp_build_gb+0x37f/0x540 [nfc]
  23  nfc_llcp_register_device+0x6eb/0xb50 [nfc]
  24  nfc_register_device+0x50/0x1d0 [nfc]
  25  nfcsim_device_new+0x394/0x67d [nfcsim]
  26  ? 0xffffffffc1080000
  27  nfcsim_init+0x6b/0x1000 [nfcsim]
  28  do_one_initcall+0xfa/0x5ca init/main.c:887
  29  do_init_module+0x204/0x5f6 kernel/module.c:3460
  30  load_module+0x66b2/0x8570 kernel/module.c:3808
  31  __do_sys_finit_module+0x238/0x2a0 kernel/module.c:3902
  32  do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
  33  entry_SYSCALL_64_after_hwframe+0x49/0xbe
  34 RIP: 0033:0x462e99
  35 Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
  36 RSP: 002b:00007f9cb79dcc58 EFLAGS: 00000246 ORIG_RAX: 0000000000000139
  37 RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000462e99
  38 RDX: 0000000000000000 RSI: 0000000020000280 RDI: 0000000000000003
  39 RBP: 00007f9cb79dcc70 R08: 0000000000000000 R09: 0000000000000000
  40 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f9cb79dd6bc
  41 R13: 00000000004bcefb R14: 00000000006f7030 R15: 0000000000000004
  42
  43 nfc_llcp_build_tlv will return NULL on fails, caller should check it,
  44 otherwise will trigger a NULL dereference.
  45
  46 Reported-by: Hulk Robot <hulkci@huawei.com>
  47 Fixes: eda21f16a5ed ("NFC: Set MIU and RW values from CONNECT and CC LLCP frames")
  48 Fixes: d646960f7986 ("NFC: Initial LLCP support")
  49 Signed-off-by: YueHaibing <yuehaibing@huawei.com>
  50 Signed-off-by: David S. Miller <davem@davemloft.net>
  51 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  52 ---
  53  net/nfc/llcp_commands.c |   20 ++++++++++++++++++++
  54  net/nfc/llcp_core.c     |   24 ++++++++++++++++++++----
  55  2 files changed, 40 insertions(+), 4 deletions(-)
  56
  57 --- a/net/nfc/llcp_commands.c
  58 +++ b/net/nfc/llcp_commands.c
  59 @@ -419,6 +419,10 @@ int nfc_llcp_send_connect(struct nfc_llc
  60                                                       sock->service_name,
  61                                                       sock->service_name_len,
  62                                                       &service_name_tlv_length);
  63 +               if (!service_name_tlv) {
  64 +                       err = -ENOMEM;
  65 +                       goto error_tlv;
  66 +               }
  67                 size += service_name_tlv_length;
  68         }
  69
  70 @@ -429,9 +433,17 @@ int nfc_llcp_send_connect(struct nfc_llc
  71
  72         miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0,
  73                                       &miux_tlv_length);
  74 +       if (!miux_tlv) {
  75 +               err = -ENOMEM;
  76 +               goto error_tlv;
  77 +       }
  78         size += miux_tlv_length;
  79
  80         rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &rw, 0, &rw_tlv_length);
  81 +       if (!rw_tlv) {
  82 +               err = -ENOMEM;
  83 +               goto error_tlv;
  84 +       }
  85         size += rw_tlv_length;
  86
  87         pr_debug("SKB size %d SN length %zu\n", size, sock->service_name_len);
  88 @@ -486,9 +498,17 @@ int nfc_llcp_send_cc(struct nfc_llcp_soc
  89
  90         miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0,
  91                                       &miux_tlv_length);
  92 +       if (!miux_tlv) {
  93 +               err = -ENOMEM;
  94 +               goto error_tlv;
  95 +       }
  96         size += miux_tlv_length;
  97
  98         rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &rw, 0, &rw_tlv_length);
  99 +       if (!rw_tlv) {
 100 +               err = -ENOMEM;
 101 +               goto error_tlv;
 102 +       }
 103         size += rw_tlv_length;
 104
 105         skb = llcp_allocate_pdu(sock, LLCP_PDU_CC, size);
 106 --- a/net/nfc/llcp_core.c
 107 +++ b/net/nfc/llcp_core.c
 108 @@ -532,10 +532,10 @@ static u8 nfc_llcp_reserve_sdp_ssap(stru
 109
 110  static int nfc_llcp_build_gb(struct nfc_llcp_local *local)
 111  {
 112 -       u8 *gb_cur, *version_tlv, version, version_length;
 113 -       u8 *lto_tlv, lto_length;
 114 -       u8 *wks_tlv, wks_length;
 115 -       u8 *miux_tlv, miux_length;
 116 +       u8 *gb_cur, version, version_length;
 117 +       u8 lto_length, wks_length, miux_length;
 118 +       u8 *version_tlv = NULL, *lto_tlv = NULL,
 119 +          *wks_tlv = NULL, *miux_tlv = NULL;
 120         __be16 wks = cpu_to_be16(local->local_wks);
 121         u8 gb_len = 0;
 122         int ret = 0;
 123 @@ -543,17 +543,33 @@ static int nfc_llcp_build_gb(struct nfc_
 124         version = LLCP_VERSION_11;
 125         version_tlv = nfc_llcp_build_tlv(LLCP_TLV_VERSION, &version,
 126                                          1, &version_length);
 127 +       if (!version_tlv) {
 128 +               ret = -ENOMEM;
 129 +               goto out;
 130 +       }
 131         gb_len += version_length;
 132
 133         lto_tlv = nfc_llcp_build_tlv(LLCP_TLV_LTO, &local->lto, 1, &lto_length);
 134 +       if (!lto_tlv) {
 135 +               ret = -ENOMEM;
 136 +               goto out;
 137 +       }
 138         gb_len += lto_length;
 139
 140         pr_debug("Local wks 0x%lx\n", local->local_wks);
 141         wks_tlv = nfc_llcp_build_tlv(LLCP_TLV_WKS, (u8 *)&wks, 2, &wks_length);
 142 +       if (!wks_tlv) {
 143 +               ret = -ENOMEM;
 144 +               goto out;
 145 +       }
 146         gb_len += wks_length;
 147
 148         miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&local->miux, 0,
 149                                       &miux_length);
 150 +       if (!miux_tlv) {
 151 +               ret = -ENOMEM;
 152 +               goto out;
 153 +       }
 154         gb_len += miux_length;
 155
 156         gb_len += ARRAY_SIZE(llcp_magic);