Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1541297

[PATCH 4.8 31/33] batman-adv: Check for alloc errors when preparing TT local data

Show all headers | View raw

4.8-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Sven Eckelmann <sven@narfation.org>

commit c2d0f48a13e53b4747704c9e692f5e765e52041a upstream.

batadv_tt_prepare_tvlv_local_data can fail to allocate the memory for the
new TVLV block. The caller is informed about this problem with the returned
length of 0. Not checking this value results in an invalid memory access
when either tt_data or tt_change is accessed.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 7ea7b4a14275 ("batman-adv: make the TT CRC logic VLAN specific")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 net/batman-adv/translation-table.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -2849,7 +2849,7 @@ static bool batadv_send_my_tt_response(s
 							     &tvlv_tt_data,
 							     &tt_change,
 							     &tt_len);
-		if (!tt_len)
+		if (!tt_len || !tvlv_len)
 			goto unlock;
 
 		/* Copy the last orig_node's OGM buffer */
@@ -2867,7 +2867,7 @@ static bool batadv_send_my_tt_response(s
 							     &tvlv_tt_data,
 							     &tt_change,
 							     &tt_len);
-		if (!tt_len)
+		if (!tt_len || !tvlv_len)
 			goto out;
 
 		/* fill the rest of the tvlv with the real TT entries */

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 20/33] crypto: marvell - Dont copy hash operation twice into the SRAM Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 33/33] crypto: rsa - Add Makefile dependencies to fix parallel builds Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 32/33] hotplug: Make register and unregister notifier API symmetric Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 02/33] powerpc/mm: Fix lazy icache flush on pre-POWER5 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 17/33] acpi, nfit, libnvdimm: fix / harden ars_status output length handling Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 28/33] ARM: dts: imx7d: fix LCDIF clock assignment Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 30/33] m68k: Fix ndelay() macro Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 31/33] batman-adv: Check for alloc errors when preparing TT local data Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 05/33] parisc: Purge TLB before setting PTE Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 10/33] locking/rtmutex: Use READ_ONCE() in rt_mutex_owner() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 22/33] crypto: mcryptd - Check mcryptd algorithm compatibility Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 06/33] parisc: Remove unnecessary TLB purges from flush_dcache_page_asm and flush_icache_page_asm Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 16/33] acpi, nfit: fix extended status translations for ACPI DSMs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 14/33] vhost-vsock: fix orphan connection reset Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 04/33] fuse: fix clearing suid, sgid for chown() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 23/33] crypto: marvell - Dont corrupt state of an STD req for re-stepped ahash Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 08/33] zram: restrict add/remove attributes to root only Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 07/33] parisc: Fix TLB related boot crash on SMP machines Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 15/33] perf/x86: Fix full width counter, counter overflow Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 11/33] device-dax: fix private mapping restriction, permit read-only Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 09/33] locking/rtmutex: Prevent dequeue vs. unlock race Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 18/33] acpi, nfit: validate ars_status output buffer size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 13/33] sched/autogroup: Fix 64-bit kernel nice level adjustment Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 26/33] Revert "ACPI: Execute _PTS before system reboot" Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 03/33] powerpc/boot: Fix build failure in 32-bit boot wrapper Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 12/33] scsi: lpfc: fix oops/BUG in lpfc_sli_ringtxcmpl_put() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 24/33] can: raw: raw_setsockopt: limit number of can_filter that can be set Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  Re: [PATCH 4.8 00/33] 4.8.15-stable review Shuah Khan <shuah.kh@samsung.com> - 2016-12-13 20:40 +0100
    Re: [PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 21:10 +0100
  Re: [PATCH 4.8 00/33] 4.8.15-stable review Guenter Roeck <linux@roeck-us.net> - 2016-12-14 05:20 +0100
    Re: [PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-14 13:50 +0100

csiph-web