brcmfmac: treat \0 as end of comment when parsing NVRAM

This fixes brcmfmac dealing with NVRAM coming from platform e.g. from a
flash MTD partition. In such cases entries are separated by \0 instead
of \n which caused ignoring whole content after the first "comment".
While platform NVRAM doesn't usually contain comments, we switch to
COMMENT state after e.g. finding an unexpected char in key name.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
index a1e1253a06c858d693137ab0ae7f96979f433476..e6673a9b6e9e248564b582e91fb90abd605af5e6 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
@@ -162,17 +162,20 @@ brcmf_nvram_handle_value(struct nvram_parser *nvp)
 static enum nvram_parser_state
 brcmf_nvram_handle_comment(struct nvram_parser *nvp)
 {
-       char *eol, *sol;
+       char *eoc, *sol;
 
        sol = (char *)&nvp->fwnv->data[nvp->pos];
-       eol = strchr(sol, '\n');
-       if (eol == NULL)
-               return END;
+       eoc = strchr(sol, '\n');
+       if (!eoc) {
+               eoc = strchr(sol, '\0');
+               if (!eoc)
+                       return END;
+       }
 
        /* eat all moving to next line */
        nvp->line++;
        nvp->column = 1;
-       nvp->pos += (eol - sol) + 1;
+       nvp->pos += (eoc - sol) + 1;
        return IDLE;
 }