diff options
| -rw-r--r-- | net/compat.c | 3 | ||||
| -rw-r--r-- | net/core/scm.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/compat.c b/net/compat.c index d5d69fa15d07..52d32f1bc728 100644 --- a/net/compat.c +++ b/net/compat.c | |||
| @@ -285,8 +285,7 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) | |||
| 285 | 285 | ||
| 286 | if (i > 0) { | 286 | if (i > 0) { |
| 287 | int cmlen = CMSG_COMPAT_LEN(i * sizeof(int)); | 287 | int cmlen = CMSG_COMPAT_LEN(i * sizeof(int)); |
| 288 | if (!err) | 288 | err = put_user(SOL_SOCKET, &cm->cmsg_level); |
| 289 | err = put_user(SOL_SOCKET, &cm->cmsg_level); | ||
| 290 | if (!err) | 289 | if (!err) |
| 291 | err = put_user(SCM_RIGHTS, &cm->cmsg_type); | 290 | err = put_user(SCM_RIGHTS, &cm->cmsg_type); |
| 292 | if (!err) | 291 | if (!err) |
diff --git a/net/core/scm.c b/net/core/scm.c index 649d01ef35b6..271cf060ef8c 100644 --- a/net/core/scm.c +++ b/net/core/scm.c | |||
| @@ -245,8 +245,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) | |||
| 245 | if (i > 0) | 245 | if (i > 0) |
| 246 | { | 246 | { |
| 247 | int cmlen = CMSG_LEN(i*sizeof(int)); | 247 | int cmlen = CMSG_LEN(i*sizeof(int)); |
| 248 | if (!err) | 248 | err = put_user(SOL_SOCKET, &cm->cmsg_level); |
| 249 | err = put_user(SOL_SOCKET, &cm->cmsg_level); | ||
| 250 | if (!err) | 249 | if (!err) |
| 251 | err = put_user(SCM_RIGHTS, &cm->cmsg_type); | 250 | err = put_user(SCM_RIGHTS, &cm->cmsg_type); |
| 252 | if (!err) | 251 | if (!err) |