From: Maciej Żenczykowski <maze@google.com>
Date: Wed, 19 Aug 2020 02:00:27 +0000 (-0700)
Subject: net-veth: Add type safety to veth_xdp_to_ptr() and veth_ptr_to_xdp()
X-Git-Tag: v5.10-rc1~107^2~394^2~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=defcffeb517b3965e64f4e5531db3b452dccbfc5;p=thirdparty%2Fkernel%2Flinux.git

net-veth: Add type safety to veth_xdp_to_ptr() and veth_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/20200819020027.4072288-1-zenczykowski@gmail.com
---

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index e56cd562a6645..b80cbffeb88e8 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -234,14 +234,14 @@ static bool veth_is_xdp_frame(void *ptr)
 	return (unsigned long)ptr & VETH_XDP_FLAG;
 }
 
-static void *veth_ptr_to_xdp(void *ptr)
+static struct xdp_frame *veth_ptr_to_xdp(void *ptr)
 {
 	return (void *)((unsigned long)ptr & ~VETH_XDP_FLAG);
 }
 
-static void *veth_xdp_to_ptr(void *ptr)
+static void *veth_xdp_to_ptr(struct xdp_frame *xdp)
 {
-	return (void *)((unsigned long)ptr | VETH_XDP_FLAG);
+	return (void *)((unsigned long)xdp | VETH_XDP_FLAG);
 }
 
 static void veth_ptr_free(void *ptr)