diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 21:39:22 +0200 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 21:39:22 +0200 |
commit | 7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f (patch) | |
tree | 78a2cf601e986694765b28079bf749a8eaa6a2b9 /net/rds/stats.c | |
parent | 0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6 (diff) | |
parent | 918d7f6f68620e0721bb31402ebf87e15f826831 (diff) | |
download | kernel_replicant_linux-7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f.tar.gz kernel_replicant_linux-7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f.tar.bz2 kernel_replicant_linux-7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f.zip |
Merge remote-tracking branch 'clk/clk-for-3.10' into sunxi/core-for-3.10
Diffstat (limited to 'net/rds/stats.c')
-rw-r--r-- | net/rds/stats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rds/stats.c b/net/rds/stats.c index 7be790d60b90..73be187d389e 100644 --- a/net/rds/stats.c +++ b/net/rds/stats.c @@ -87,6 +87,7 @@ void rds_stats_info_copy(struct rds_info_iterator *iter, for (i = 0; i < nr; i++) { BUG_ON(strlen(names[i]) >= sizeof(ctr.name)); strncpy(ctr.name, names[i], sizeof(ctr.name) - 1); + ctr.name[sizeof(ctr.name) - 1] = '\0'; ctr.value = values[i]; rds_info_copy(iter, &ctr, sizeof(ctr)); |