UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net-tun: Add type safety to tun_xdp_to_ptr() and tun_ptr_to_xdp() 

This reduces likelihood of incorrect use.

Test: builds

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200819010710.3959310-1-zenczykowski@gmail.com
This commit is contained in:
Maciej Żenczykowski 2020-08-18 18:07:09 -07:00 committed by Alexei Starovoitov
parent 3708115614
commit b558b6c240
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/tun.c
View File

@ -225,13 +225,13 @@ bool tun_is_xdp_frame(void *ptr)
} }
EXPORT_SYMBOL(tun_is_xdp_frame); EXPORT_SYMBOL(tun_is_xdp_frame);
void *tun_xdp_to_ptr(void *ptr) void *tun_xdp_to_ptr(struct xdp_frame *xdp)
{ {
return (void *)((unsigned long)ptr | TUN_XDP_FLAG); return (void *)((unsigned long)xdp | TUN_XDP_FLAG);
} }
EXPORT_SYMBOL(tun_xdp_to_ptr); EXPORT_SYMBOL(tun_xdp_to_ptr);
void *tun_ptr_to_xdp(void *ptr) struct xdp_frame *tun_ptr_to_xdp(void *ptr)
{ {
return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG); return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
} }

8
include/linux/if_tun.h
View File

@ -28,8 +28,8 @@ struct tun_xdp_hdr {
struct socket *tun_get_socket(struct file *); struct socket *tun_get_socket(struct file *);
struct ptr_ring *tun_get_tx_ring(struct file *file); struct ptr_ring *tun_get_tx_ring(struct file *file);
bool tun_is_xdp_frame(void *ptr); bool tun_is_xdp_frame(void *ptr);
void *tun_xdp_to_ptr(void *ptr); void *tun_xdp_to_ptr(struct xdp_frame *xdp);
void *tun_ptr_to_xdp(void *ptr); struct xdp_frame *tun_ptr_to_xdp(void *ptr);
void tun_ptr_free(void *ptr); void tun_ptr_free(void *ptr);
#else #else
#include <linux/err.h> #include <linux/err.h>
@ -48,11 +48,11 @@ static inline bool tun_is_xdp_frame(void *ptr)
{ {
return false; return false;
} }
static inline void *tun_xdp_to_ptr(void *ptr) static inline void *tun_xdp_to_ptr(struct xdp_frame *xdp)
{ {
return NULL; return NULL;
} }
static inline void *tun_ptr_to_xdp(void *ptr) static inline struct xdp_frame *tun_ptr_to_xdp(void *ptr)
{ {
return NULL; return NULL;
} }