diff options
author | David S. Miller <davem@davemloft.net> | 2015-12-31 18:20:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-31 18:20:10 -0500 |
commit | c07f30ad68053181b3e8a0e65b0630e12e844f91 (patch) | |
tree | 8758968aabc844c435ff2a5d7d02c835fccd02a3 /net/ipv6/addrconf.c | |
parent | 7b22a7788b0263f42f7232c5c05c503424ffa0ba (diff) | |
parent | 9c982e86dbdbaa3fb248dfc776dddda32cbc8927 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 819b7777f3cb..8697551b16a8 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -5415,13 +5415,10 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write, | |||
5415 | goto out; | 5415 | goto out; |
5416 | } | 5416 | } |
5417 | 5417 | ||
5418 | if (!write) { | 5418 | err = snprintf(str, sizeof(str), "%pI6", &secret->secret); |
5419 | err = snprintf(str, sizeof(str), "%pI6", | 5419 | if (err >= sizeof(str)) { |
5420 | &secret->secret); | 5420 | err = -EIO; |
5421 | if (err >= sizeof(str)) { | 5421 | goto out; |
5422 | err = -EIO; | ||
5423 | goto out; | ||
5424 | } | ||
5425 | } | 5422 | } |
5426 | 5423 | ||
5427 | err = proc_dostring(&lctl, write, buffer, lenp, ppos); | 5424 | err = proc_dostring(&lctl, write, buffer, lenp, ppos); |