diff options
author | Ursula Braun <ursula.braun@de.ibm.com> | 2014-05-28 04:22:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-30 20:35:23 -0400 |
commit | a68be015aece7b9f33f1523048e445b72ca7111d (patch) | |
tree | af8d8ad62a6b81cc570cdfed83496872e670e909 /drivers/s390/net/ctcm_sysfs.c | |
parent | e95051ff5a0b76e672f6d30e8bb8f93cc11c8018 (diff) |
s390/net: fix format string mismatches
cppcheck blamed some issues in drivers/s390/net/...
They are fixed here.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
Reported-by: Toralf Foerster <toralf.foerster@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/ctcm_sysfs.c')
-rw-r--r-- | drivers/s390/net/ctcm_sysfs.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c index 985b5dcbdac8..6bcfbbb20f04 100644 --- a/drivers/s390/net/ctcm_sysfs.c +++ b/drivers/s390/net/ctcm_sysfs.c | |||
@@ -34,8 +34,9 @@ static ssize_t ctcm_buffer_write(struct device *dev, | |||
34 | struct device_attribute *attr, const char *buf, size_t count) | 34 | struct device_attribute *attr, const char *buf, size_t count) |
35 | { | 35 | { |
36 | struct net_device *ndev; | 36 | struct net_device *ndev; |
37 | int bs1; | 37 | unsigned int bs1; |
38 | struct ctcm_priv *priv = dev_get_drvdata(dev); | 38 | struct ctcm_priv *priv = dev_get_drvdata(dev); |
39 | int rc; | ||
39 | 40 | ||
40 | ndev = priv->channel[CTCM_READ]->netdev; | 41 | ndev = priv->channel[CTCM_READ]->netdev; |
41 | if (!(priv && priv->channel[CTCM_READ] && ndev)) { | 42 | if (!(priv && priv->channel[CTCM_READ] && ndev)) { |
@@ -43,7 +44,9 @@ static ssize_t ctcm_buffer_write(struct device *dev, | |||
43 | return -ENODEV; | 44 | return -ENODEV; |
44 | } | 45 | } |
45 | 46 | ||
46 | sscanf(buf, "%u", &bs1); | 47 | rc = sscanf(buf, "%u", &bs1); |
48 | if (rc != 1) | ||
49 | goto einval; | ||
47 | if (bs1 > CTCM_BUFSIZE_LIMIT) | 50 | if (bs1 > CTCM_BUFSIZE_LIMIT) |
48 | goto einval; | 51 | goto einval; |
49 | if (bs1 < (576 + LL_HEADER_LENGTH + 2)) | 52 | if (bs1 < (576 + LL_HEADER_LENGTH + 2)) |
@@ -143,13 +146,14 @@ static ssize_t ctcm_proto_show(struct device *dev, | |||
143 | static ssize_t ctcm_proto_store(struct device *dev, | 146 | static ssize_t ctcm_proto_store(struct device *dev, |
144 | struct device_attribute *attr, const char *buf, size_t count) | 147 | struct device_attribute *attr, const char *buf, size_t count) |
145 | { | 148 | { |
146 | int value; | 149 | int value, rc; |
147 | struct ctcm_priv *priv = dev_get_drvdata(dev); | 150 | struct ctcm_priv *priv = dev_get_drvdata(dev); |
148 | 151 | ||
149 | if (!priv) | 152 | if (!priv) |
150 | return -ENODEV; | 153 | return -ENODEV; |
151 | sscanf(buf, "%u", &value); | 154 | rc = sscanf(buf, "%d", &value); |
152 | if (!((value == CTCM_PROTO_S390) || | 155 | if ((rc != 1) || |
156 | !((value == CTCM_PROTO_S390) || | ||
153 | (value == CTCM_PROTO_LINUX) || | 157 | (value == CTCM_PROTO_LINUX) || |
154 | (value == CTCM_PROTO_MPC) || | 158 | (value == CTCM_PROTO_MPC) || |
155 | (value == CTCM_PROTO_OS390))) | 159 | (value == CTCM_PROTO_OS390))) |