diff options
| author | David S. Miller <[email protected]> | 2020-10-03 16:51:07 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2020-10-03 16:51:07 -0700 |
| commit | 223b32db00a8d68b93985bd212a3bfc48fdb8ac0 (patch) | |
| tree | 01878b642fd4ff59a6e865238b1bb4d934e34bbe | |
| parent | 8e1b3884eed7d96d4f1210b668611ee6a1803ea5 (diff) | |
| parent | a29f245ec97f83f697c7442e0f1222f2ac7c9507 (diff) | |
Merge branch 'net-iucv-next'
Julian Wiedmann says:
====================
net/iucv: updates 2020-10-01
Just two (rare) patches, and both deal with smatch warnings.
====================
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | net/iucv/af_iucv.c | 2 | ||||
| -rw-r--r-- | net/iucv/iucv.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index a95af62acb52..d80572074667 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -588,11 +588,11 @@ static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len) { struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr; + char uid[sizeof(sa->siucv_user_id)]; struct sock *sk = sock->sk; struct iucv_sock *iucv; int err = 0; struct net_device *dev; - char uid[9]; /* Verify the input sockaddr */ if (addr_len < sizeof(struct sockaddr_iucv) || diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index cd2e468852e7..349c6ac3313f 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c @@ -1116,10 +1116,9 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg, if (msg->flags & IUCV_IPRMDATA) return iucv_message_receive_iprmdata(path, msg, flags, buffer, size, residual); - if (cpumask_empty(&iucv_buffer_cpumask)) { - rc = -EIO; - goto out; - } + if (cpumask_empty(&iucv_buffer_cpumask)) + return -EIO; + parm = iucv_param[smp_processor_id()]; memset(parm, 0, sizeof(union iucv_param)); parm->db.ipbfadr1 = (u32)(addr_t) buffer; @@ -1135,7 +1134,6 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg, if (residual) *residual = parm->db.ipbfln1f; } -out: return rc; } EXPORT_SYMBOL(__iucv_message_receive); |