mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
719c44d340
Socket option PACKET_FANOUT_DATA takes a struct sock_fprog as argument
if PACKET_FANOUT has mode PACKET_FANOUT_CBPF. This structure contains
a pointer into user memory. If userland is 32-bit and kernel is 64-bit
the two disagree about the layout of struct sock_fprog.
Add compat setsockopt support to convert a 32-bit compat_sock_fprog to
a 64-bit sock_fprog. This is analogous to compat_sock_fprog support for
SO_REUSEPORT added in commit 1957598840 ("soreuseport: add compat
case for setsockopt SO_ATTACH_REUSEPORT_CBPF").
Reported-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
69 lines
2.1 KiB
C
69 lines
2.1 KiB
C
#ifndef NET_COMPAT_H
|
|
#define NET_COMPAT_H
|
|
|
|
|
|
struct sock;
|
|
|
|
#if defined(CONFIG_COMPAT)
|
|
|
|
#include <linux/compat.h>
|
|
|
|
struct compat_msghdr {
|
|
compat_uptr_t msg_name; /* void * */
|
|
compat_int_t msg_namelen;
|
|
compat_uptr_t msg_iov; /* struct compat_iovec * */
|
|
compat_size_t msg_iovlen;
|
|
compat_uptr_t msg_control; /* void * */
|
|
compat_size_t msg_controllen;
|
|
compat_uint_t msg_flags;
|
|
};
|
|
|
|
struct compat_mmsghdr {
|
|
struct compat_msghdr msg_hdr;
|
|
compat_uint_t msg_len;
|
|
};
|
|
|
|
struct compat_cmsghdr {
|
|
compat_size_t cmsg_len;
|
|
compat_int_t cmsg_level;
|
|
compat_int_t cmsg_type;
|
|
};
|
|
|
|
int compat_sock_get_timestamp(struct sock *, struct timeval __user *);
|
|
int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
|
|
|
|
#else /* defined(CONFIG_COMPAT) */
|
|
/*
|
|
* To avoid compiler warnings:
|
|
*/
|
|
#define compat_msghdr msghdr
|
|
#define compat_mmsghdr mmsghdr
|
|
#endif /* defined(CONFIG_COMPAT) */
|
|
|
|
int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *,
|
|
struct sockaddr __user **, struct iovec **);
|
|
struct sock_fprog __user *get_compat_bpf_fprog(char __user *optval);
|
|
asmlinkage long compat_sys_sendmsg(int, struct compat_msghdr __user *,
|
|
unsigned int);
|
|
asmlinkage long compat_sys_sendmmsg(int, struct compat_mmsghdr __user *,
|
|
unsigned int, unsigned int);
|
|
asmlinkage long compat_sys_recvmsg(int, struct compat_msghdr __user *,
|
|
unsigned int);
|
|
asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
|
|
unsigned int, unsigned int,
|
|
struct compat_timespec __user *);
|
|
asmlinkage long compat_sys_getsockopt(int, int, int, char __user *,
|
|
int __user *);
|
|
int put_cmsg_compat(struct msghdr*, int, int, int, void *);
|
|
|
|
int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *,
|
|
unsigned char *, int);
|
|
|
|
int compat_mc_setsockopt(struct sock *, int, int, char __user *, unsigned int,
|
|
int (*)(struct sock *, int, int, char __user *,
|
|
unsigned int));
|
|
int compat_mc_getsockopt(struct sock *, int, int, char __user *, int __user *,
|
|
int (*)(struct sock *, int, int, char __user *,
|
|
int __user *));
|
|
|
|
#endif /* NET_COMPAT_H */
|