aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-07-03 23:18:33 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-07-03 23:18:33 +0000
commit596345c98d86e0f7e98649356c57c4ea1a48299c (patch)
tree3c314bf2e603bf087f1ec9fc8d861320e63c6c31 /target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
parent3e77770be6b25f18588d361caa42d8a4b9c70390 (diff)
downloadmaster-187ad058-596345c98d86e0f7e98649356c57c4ea1a48299c.tar.gz
master-187ad058-596345c98d86e0f7e98649356c57c4ea1a48299c.tar.bz2
master-187ad058-596345c98d86e0f7e98649356c57c4ea1a48299c.zip
brcm47xx: add support for kernel 4.1
This adds support for kernel 4.1 and removes kernel 4.0. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46166 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch b/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
deleted file mode 100644
index ee2e2732ff..0000000000
--- a/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 80aaaa8b93d860f828e2cf883f307894640765f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 10 Dec 2014 11:49:54 +0100
-Subject: [PATCH] MIPS: BCM47XX: Use strnchr to avoid reading out of the buffer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: Paul Walmsley <paul@pwsan.com>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/8662/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/nvram.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -175,7 +175,7 @@ static int nvram_init(void)
- int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
- {
- char *var, *value, *end, *eq;
-- int err;
-+ int data_left, err;
-
- if (!name)
- return -EINVAL;
-@@ -191,7 +191,9 @@ int bcm47xx_nvram_getenv(const char *nam
- end = nvram_buf + sizeof(nvram_buf) - 2;
- end[0] = end[1] = '\0';
- for (; *var; var = value + strlen(value) + 1) {
-- eq = strchr(var, '=');
-+ data_left = end - var;
-+
-+ eq = strnchr(var, data_left, '=');
- if (!eq)
- break;
- value = eq + 1;