Commit fb839c75 authored by Luis Henriques's avatar Luis Henriques Committed by Kamal Mostafa

Revert "UBUNTU: SAUCE: (noup) netfilter: x_tables: check for size overflow"

This reverts commit 7da29bde.

Dropping this SAUCE patch and replacing it by the upstream fix for
CVE-2016-3135:

  d157bd76 "netfilter: x_tables: check for size overflow"

The original fix (being reverted) was modified to keep only the 2nd check.

https://marc.info/?l=netfilter-devel&m=145778004016206&w=2Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
Acked-by: default avatarTim Gardner <tim.gardner@canonical.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 8eb25e5a
...@@ -898,9 +898,6 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size) ...@@ -898,9 +898,6 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size)
struct xt_table_info *info = NULL; struct xt_table_info *info = NULL;
size_t sz = sizeof(*info) + size; size_t sz = sizeof(*info) + size;
if (sz < size || sz < sizeof(*info))
return NULL;
/* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */ /* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */
if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > totalram_pages) if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > totalram_pages)
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment