diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2015-06-05 20:41:18 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2015-06-05 20:41:18 +0000 |
commit | fc0776f2c70754aa394b95b60568f02d6aad755c (patch) | |
tree | 2e7929506223a063bd280652e0f9b98b72deb4fd /target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch | |
parent | 908e1b4c41301d840efe1de9e3b44f1f8600feb5 (diff) | |
download | master-31e0f0ae-fc0776f2c70754aa394b95b60568f02d6aad755c.tar.gz master-31e0f0ae-fc0776f2c70754aa394b95b60568f02d6aad755c.tar.bz2 master-31e0f0ae-fc0776f2c70754aa394b95b60568f02d6aad755c.zip |
brcm47xx: backport MIPS BCM47XX changes queued for 4.2
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 45906
Diffstat (limited to 'target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch b/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch new file mode 100644 index 0000000000..c74bd06495 --- /dev/null +++ b/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch @@ -0,0 +1,64 @@ +From f6f895644230b13618f14f7108f9b23a21a87bfa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> +Date: Tue, 12 May 2015 18:46:12 +0200 +Subject: [PATCH] MIPS: BCM47XX: Simplify function looking for NVRAM entry +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +First of all it shouldn't modify copied NVRAM just to make sure it can +loop over all entries. It's enough to just compare current position +pointer with the end of buffer address. +Secondly buffer is guaranteed to be \0 ended, so we don't need strnchr. + +Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +Cc: linux-mips@linux-mips.org +Cc: Hauke Mehrtens <hauke@hauke-m.de> +Cc: Hante Meuleman <meuleman@broadcom.com> +Cc: Ian Kent <raven@themaw.net> +Patchwork: https://patchwork.linux-mips.org/patch/10032/ +Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +--- + arch/mips/bcm47xx/nvram.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c +index dee1c32..95d028c 100644 +--- a/arch/mips/bcm47xx/nvram.c ++++ b/arch/mips/bcm47xx/nvram.c +@@ -171,7 +171,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 data_left, err; ++ int err; + + if (!name) + return -EINVAL; +@@ -184,19 +184,16 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len) + + /* Look for name=value and return value */ + var = &nvram_buf[sizeof(struct nvram_header)]; +- end = nvram_buf + sizeof(nvram_buf) - 2; +- end[0] = '\0'; +- end[1] = '\0'; +- for (; *var; var = value + strlen(value) + 1) { +- data_left = end - var; +- +- eq = strnchr(var, data_left, '='); ++ end = nvram_buf + sizeof(nvram_buf); ++ while (var < end && *var) { ++ eq = strchr(var, '='); + if (!eq) + break; + value = eq + 1; + if (eq - var == strlen(name) && + strncmp(var, name, eq - var) == 0) + return snprintf(val, val_len, "%s", value); ++ var = value + strlen(value) + 1; + } + return -ENOENT; + } +-- +1.8.4.5 + |