|
@@ -435,15 +435,13 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
|
|
if (!filter)
|
|
if (!filter)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
- err = copy_from_user(filter, optval, optlen);
|
|
|
|
- if (err) {
|
|
|
|
|
|
+ if (copy_from_user(filter, optval, optlen)) {
|
|
kfree(filter);
|
|
kfree(filter);
|
|
- return err;
|
|
|
|
|
|
+ return -EFAULT;
|
|
}
|
|
}
|
|
} else if (count == 1) {
|
|
} else if (count == 1) {
|
|
- err = copy_from_user(&sfilter, optval, optlen);
|
|
|
|
- if (err)
|
|
|
|
- return err;
|
|
|
|
|
|
+ if (copy_from_user(&sfilter, optval, optlen))
|
|
|
|
+ return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
lock_sock(sk);
|
|
lock_sock(sk);
|
|
@@ -493,9 +491,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
|
|
if (optlen != sizeof(err_mask))
|
|
if (optlen != sizeof(err_mask))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- err = copy_from_user(&err_mask, optval, optlen);
|
|
|
|
- if (err)
|
|
|
|
- return err;
|
|
|
|
|
|
+ if (copy_from_user(&err_mask, optval, optlen))
|
|
|
|
+ return -EFAULT;
|
|
|
|
|
|
err_mask &= CAN_ERR_MASK;
|
|
err_mask &= CAN_ERR_MASK;
|
|
|
|
|
|
@@ -531,7 +528,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
|
|
if (optlen != sizeof(ro->loopback))
|
|
if (optlen != sizeof(ro->loopback))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- err = copy_from_user(&ro->loopback, optval, optlen);
|
|
|
|
|
|
+ if (copy_from_user(&ro->loopback, optval, optlen))
|
|
|
|
+ return -EFAULT;
|
|
|
|
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -539,7 +537,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
|
|
if (optlen != sizeof(ro->recv_own_msgs))
|
|
if (optlen != sizeof(ro->recv_own_msgs))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- err = copy_from_user(&ro->recv_own_msgs, optval, optlen);
|
|
|
|
|
|
+ if (copy_from_user(&ro->recv_own_msgs, optval, optlen))
|
|
|
|
+ return -EFAULT;
|
|
|
|
|
|
break;
|
|
break;
|
|
|
|
|