aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-15 15:59:51 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-15 19:40:51 -0400
commit51ec138c6416e9ed2ba0eae3af5f0ea8a90ae44b (patch)
tree4c451864585014378922e16761be0a5225455166
parent0e81c666dbf95546b3d9ea6ff7d29ea19b988950 (diff)
ieee1394: forgotten dereference...
Going through the string and waiting for _pointer_ to become '\0' is not what the authors meant... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Ben Collins <ben.collins@ubuntu.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/ieee1394/nodemgr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index c4d3d4131f01..51a12062ed36 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -283,7 +283,7 @@ static ssize_t fw_show_##class##_##td_kv (struct device *dev, struct device_attr
283 memcpy(buf, \ 283 memcpy(buf, \
284 CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA(class->td_kv), \ 284 CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA(class->td_kv), \
285 len); \ 285 len); \
286 while ((buf + len - 1) == '\0') \ 286 while (buf[len - 1] == '\0') \
287 len--; \ 287 len--; \
288 buf[len++] = '\n'; \ 288 buf[len++] = '\n'; \
289 buf[len] = '\0'; \ 289 buf[len] = '\0'; \