diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/compat.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/compat.c b/net/compat.c index 3236b4167a32..94d3d5e97883 100644 --- a/net/compat.c +++ b/net/compat.c | |||
| @@ -711,24 +711,18 @@ static unsigned char nas[21] = { | |||
| 711 | 711 | ||
| 712 | COMPAT_SYSCALL_DEFINE3(sendmsg, int, fd, struct compat_msghdr __user *, msg, unsigned int, flags) | 712 | COMPAT_SYSCALL_DEFINE3(sendmsg, int, fd, struct compat_msghdr __user *, msg, unsigned int, flags) |
| 713 | { | 713 | { |
| 714 | if (flags & MSG_CMSG_COMPAT) | ||
| 715 | return -EINVAL; | ||
| 716 | return __sys_sendmsg(fd, (struct user_msghdr __user *)msg, flags | MSG_CMSG_COMPAT); | 714 | return __sys_sendmsg(fd, (struct user_msghdr __user *)msg, flags | MSG_CMSG_COMPAT); |
| 717 | } | 715 | } |
| 718 | 716 | ||
| 719 | COMPAT_SYSCALL_DEFINE4(sendmmsg, int, fd, struct compat_mmsghdr __user *, mmsg, | 717 | COMPAT_SYSCALL_DEFINE4(sendmmsg, int, fd, struct compat_mmsghdr __user *, mmsg, |
| 720 | unsigned int, vlen, unsigned int, flags) | 718 | unsigned int, vlen, unsigned int, flags) |
| 721 | { | 719 | { |
| 722 | if (flags & MSG_CMSG_COMPAT) | ||
| 723 | return -EINVAL; | ||
| 724 | return __sys_sendmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, | 720 | return __sys_sendmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, |
| 725 | flags | MSG_CMSG_COMPAT); | 721 | flags | MSG_CMSG_COMPAT); |
| 726 | } | 722 | } |
| 727 | 723 | ||
| 728 | COMPAT_SYSCALL_DEFINE3(recvmsg, int, fd, struct compat_msghdr __user *, msg, unsigned int, flags) | 724 | COMPAT_SYSCALL_DEFINE3(recvmsg, int, fd, struct compat_msghdr __user *, msg, unsigned int, flags) |
| 729 | { | 725 | { |
| 730 | if (flags & MSG_CMSG_COMPAT) | ||
| 731 | return -EINVAL; | ||
| 732 | return __sys_recvmsg(fd, (struct user_msghdr __user *)msg, flags | MSG_CMSG_COMPAT); | 726 | return __sys_recvmsg(fd, (struct user_msghdr __user *)msg, flags | MSG_CMSG_COMPAT); |
| 733 | } | 727 | } |
| 734 | 728 | ||
| @@ -751,9 +745,6 @@ COMPAT_SYSCALL_DEFINE5(recvmmsg, int, fd, struct compat_mmsghdr __user *, mmsg, | |||
| 751 | int datagrams; | 745 | int datagrams; |
| 752 | struct timespec ktspec; | 746 | struct timespec ktspec; |
| 753 | 747 | ||
| 754 | if (flags & MSG_CMSG_COMPAT) | ||
| 755 | return -EINVAL; | ||
| 756 | |||
| 757 | if (timeout == NULL) | 748 | if (timeout == NULL) |
| 758 | return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, | 749 | return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, |
| 759 | flags | MSG_CMSG_COMPAT, NULL); | 750 | flags | MSG_CMSG_COMPAT, NULL); |
