diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:11:24 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:12:24 (GMT) |
| commit | ffb069a30665ec06c05916355bc3252e33fc863b (patch) | |
| tree | ba7b82696000c0f2983672d22966b83112da874e /lib | |
| parent | 8d5cd1658cb0c97d5429124f9fb5caa88c460186 (diff) | |
| parent | 3756888c2a2da9c7291d39cacd1184171111b49d (diff) | |
| download | linux-fsl-qoriq-ffb069a30665ec06c05916355bc3252e33fc863b.tar.xz | |
Merge remote-tracking branch 'stable/linux-3.12.y' into sdk-v1.6.x
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
arch/sparc/Kconfig
drivers/tty/tty_buffer.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/nlattr.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/nlattr.c b/lib/nlattr.c index 18eca78..fc67547 100644 --- a/lib/nlattr.c +++ b/lib/nlattr.c @@ -303,9 +303,15 @@ int nla_memcmp(const struct nlattr *nla, const void *data, */ int nla_strcmp(const struct nlattr *nla, const char *str) { - int len = strlen(str) + 1; - int d = nla_len(nla) - len; + int len = strlen(str); + char *buf = nla_data(nla); + int attrlen = nla_len(nla); + int d; + if (attrlen > 0 && buf[attrlen - 1] == '\0') + attrlen--; + + d = attrlen - len; if (d == 0) d = memcmp(nla_data(nla), str, len); |