qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ip_tunnel: Preserve pointer const in ip_tunnel_info_opts 

JIRA: https://issues.redhat.com/browse/RHEL-19222

commit bc9d003dc48c381763c3a6309bfc5eecf9962b9c
Author: Gavin Li <gavinl@nvidia.com>
Date:   Thu Mar 16 09:07:57 2023 +0200

    ip_tunnel: Preserve pointer const in ip_tunnel_info_opts

    Change ip_tunnel_info_opts( ) from static function to macro to cast return
    value and preserve the const-ness of the pointer.

    Signed-off-by: Gavin Li <gavinl@nvidia.com>
    Reviewed-by: Eric Dumazet <edumazet@google.com>
    Reviewed-by: Simon Horman <simon.horman@corigine.com>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
This commit is contained in:
Michal Schmidt 2023-12-12 12:28:05 +01:00
parent 3da47f348b
commit 044c7c29ec
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/net/ip_tunnels.h
View File

@ -67,6 +67,12 @@ struct ip_tunnel_key {
GENMASK((sizeof_field(struct ip_tunnel_info, \
options_len) * BITS_PER_BYTE) - 1, 0)
#define ip_tunnel_info_opts(info) \
_Generic(info, \
const struct ip_tunnel_info * : ((const void *)((info) + 1)),\
struct ip_tunnel_info * : ((void *)((info) + 1))\
)
struct ip_tunnel_info {
struct ip_tunnel_key key;
#ifdef CONFIG_DST_CACHE
@ -479,11 +485,6 @@ static inline void iptunnel_xmit_stats(struct net_device *dev, int pkt_len)
}
}
static inline void *ip_tunnel_info_opts(struct ip_tunnel_info *info)
{
return info + 1;
}
static inline void ip_tunnel_info_opts_get(void *to,
const struct ip_tunnel_info *info)
{