Commit 687d9114 authored by David S. Miller's avatar David S. Miller

Merge branch 's390-net'

Ursula Braun says:

====================
s390 network driver patches

here are 3 small patches for the s390 network drivers netiucv and lcs.
They are built for the net-tree.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents de1dfeef f7e3a16c
...@@ -1888,7 +1888,7 @@ lcs_stop_device(struct net_device *dev) ...@@ -1888,7 +1888,7 @@ lcs_stop_device(struct net_device *dev)
rc = lcs_stopcard(card); rc = lcs_stopcard(card);
if (rc) if (rc)
dev_err(&card->dev->dev, dev_err(&card->dev->dev,
" Shutting down the LCS device failed\n "); " Shutting down the LCS device failed\n");
return rc; return rc;
} }
......
...@@ -302,8 +302,7 @@ static char *netiucv_printuser(struct iucv_connection *conn) ...@@ -302,8 +302,7 @@ static char *netiucv_printuser(struct iucv_connection *conn)
if (memcmp(conn->userdata, iucvMagic_ebcdic, 16)) { if (memcmp(conn->userdata, iucvMagic_ebcdic, 16)) {
tmp_uid[8] = '\0'; tmp_uid[8] = '\0';
tmp_udat[16] = '\0'; tmp_udat[16] = '\0';
memcpy(tmp_uid, conn->userid, 8); memcpy(tmp_uid, netiucv_printname(conn->userid, 8), 8);
memcpy(tmp_uid, netiucv_printname(tmp_uid, 8), 8);
memcpy(tmp_udat, conn->userdata, 16); memcpy(tmp_udat, conn->userdata, 16);
EBCASC(tmp_udat, 16); EBCASC(tmp_udat, 16);
memcpy(tmp_udat, netiucv_printname(tmp_udat, 16), 16); memcpy(tmp_udat, netiucv_printname(tmp_udat, 16), 16);
...@@ -1564,21 +1563,21 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr, ...@@ -1564,21 +1563,21 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr,
{ {
struct netiucv_priv *priv = dev_get_drvdata(dev); struct netiucv_priv *priv = dev_get_drvdata(dev);
struct net_device *ndev = priv->conn->netdev; struct net_device *ndev = priv->conn->netdev;
char *e; unsigned int bs1;
int bs1; int rc;
IUCV_DBF_TEXT(trace, 3, __func__); IUCV_DBF_TEXT(trace, 3, __func__);
if (count >= 39) if (count >= 39)
return -EINVAL; return -EINVAL;
bs1 = simple_strtoul(buf, &e, 0); rc = kstrtouint(buf, 0, &bs1);
if (e && (!isspace(*e))) { if (rc == -EINVAL) {
IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %02x\n", IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %s\n",
*e); buf);
return -EINVAL; return -EINVAL;
} }
if (bs1 > NETIUCV_BUFSIZE_MAX) { if ((rc == -ERANGE) || (bs1 > NETIUCV_BUFSIZE_MAX)) {
IUCV_DBF_TEXT_(setup, 2, IUCV_DBF_TEXT_(setup, 2,
"buffer_write: buffer size %d too large\n", "buffer_write: buffer size %d too large\n",
bs1); bs1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment