openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-10-03 16:51:07 -07:00
parent 8e1b3884ee a29f245ec9
commit 223b32db00
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/iucv/af_iucv.c
View File

@ -588,11 +588,11 @@ static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,
int addr_len) int addr_len)
{ {
struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr; struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
char uid[sizeof(sa->siucv_user_id)];
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct iucv_sock *iucv; struct iucv_sock *iucv;
int err = 0; int err = 0;
struct net_device *dev; struct net_device *dev;
char uid[9];
/* Verify the input sockaddr */ /* Verify the input sockaddr */
if (addr_len < sizeof(struct sockaddr_iucv) || if (addr_len < sizeof(struct sockaddr_iucv) ||

8
net/iucv/iucv.c
View File

@ -1116,10 +1116,9 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
if (msg->flags & IUCV_IPRMDATA) if (msg->flags & IUCV_IPRMDATA)
return iucv_message_receive_iprmdata(path, msg, flags, return iucv_message_receive_iprmdata(path, msg, flags,
buffer, size, residual); buffer, size, residual);
if (cpumask_empty(&iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask))
rc = -EIO; return -EIO;
goto out;
}
parm = iucv_param[smp_processor_id()]; parm = iucv_param[smp_processor_id()];
memset(parm, 0, sizeof(union iucv_param)); memset(parm, 0, sizeof(union iucv_param));
parm->db.ipbfadr1 = (u32)(addr_t) buffer; 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) if (residual)
*residual = parm->db.ipbfln1f; *residual = parm->db.ipbfln1f;
} }
out:
return rc; return rc;
} }
EXPORT_SYMBOL(__iucv_message_receive); EXPORT_SYMBOL(__iucv_message_receive);