824e7383e9
When CONFIG_LWTUNNEL config is not enabled, the lwtstate_free() is not
declared in lwtunnel.h at all. However, even in this case, the function
is still referenced in fib_semantics.c so that there appears the
following sparse warnings:
net/ipv4/fib_semantics.c:553:17: error: undefined identifier 'lwtstate_free'
CC net/ipv4/fib_semantics.o
net/ipv4/fib_semantics.c: In function ‘fib_encap_match’:
net/ipv4/fib_semantics.c:553:3: error: implicit declaration of function ‘lwtstate_free’ [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[1]: *** [net/ipv4/fib_semantics.o] Error 1
make: *** [net/ipv4/fib_semantics.o] Error 2
To eliminate the error, we define an empty function for lwtstate_free()
in lwtunnel.h when CONFIG_LWTUNNEL is disabled.
Fixes: df383e6240 ("lwtunnel: fix memory leak")
Cc: Jiri Benc <jbenc@redhat.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
185 lines
4.1 KiB
C
185 lines
4.1 KiB
C
#ifndef __NET_LWTUNNEL_H
|
|
#define __NET_LWTUNNEL_H 1
|
|
|
|
#include <linux/lwtunnel.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/types.h>
|
|
#include <net/route.h>
|
|
|
|
#define LWTUNNEL_HASH_BITS 7
|
|
#define LWTUNNEL_HASH_SIZE (1 << LWTUNNEL_HASH_BITS)
|
|
|
|
/* lw tunnel state flags */
|
|
#define LWTUNNEL_STATE_OUTPUT_REDIRECT BIT(0)
|
|
#define LWTUNNEL_STATE_INPUT_REDIRECT BIT(1)
|
|
|
|
struct lwtunnel_state {
|
|
__u16 type;
|
|
__u16 flags;
|
|
atomic_t refcnt;
|
|
int (*orig_output)(struct sock *sk, struct sk_buff *skb);
|
|
int (*orig_input)(struct sk_buff *);
|
|
int len;
|
|
__u8 data[0];
|
|
};
|
|
|
|
struct lwtunnel_encap_ops {
|
|
int (*build_state)(struct net_device *dev, struct nlattr *encap,
|
|
struct lwtunnel_state **ts);
|
|
int (*output)(struct sock *sk, struct sk_buff *skb);
|
|
int (*input)(struct sk_buff *skb);
|
|
int (*fill_encap)(struct sk_buff *skb,
|
|
struct lwtunnel_state *lwtstate);
|
|
int (*get_encap_size)(struct lwtunnel_state *lwtstate);
|
|
int (*cmp_encap)(struct lwtunnel_state *a, struct lwtunnel_state *b);
|
|
};
|
|
|
|
#ifdef CONFIG_LWTUNNEL
|
|
static inline void lwtstate_free(struct lwtunnel_state *lws)
|
|
{
|
|
kfree(lws);
|
|
}
|
|
|
|
static inline struct lwtunnel_state *
|
|
lwtstate_get(struct lwtunnel_state *lws)
|
|
{
|
|
if (lws)
|
|
atomic_inc(&lws->refcnt);
|
|
|
|
return lws;
|
|
}
|
|
|
|
static inline void lwtstate_put(struct lwtunnel_state *lws)
|
|
{
|
|
if (!lws)
|
|
return;
|
|
|
|
if (atomic_dec_and_test(&lws->refcnt))
|
|
lwtstate_free(lws);
|
|
}
|
|
|
|
static inline bool lwtunnel_output_redirect(struct lwtunnel_state *lwtstate)
|
|
{
|
|
if (lwtstate && (lwtstate->flags & LWTUNNEL_STATE_OUTPUT_REDIRECT))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
static inline bool lwtunnel_input_redirect(struct lwtunnel_state *lwtstate)
|
|
{
|
|
if (lwtstate && (lwtstate->flags & LWTUNNEL_STATE_INPUT_REDIRECT))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
int lwtunnel_encap_add_ops(const struct lwtunnel_encap_ops *op,
|
|
unsigned int num);
|
|
int lwtunnel_encap_del_ops(const struct lwtunnel_encap_ops *op,
|
|
unsigned int num);
|
|
int lwtunnel_build_state(struct net_device *dev, u16 encap_type,
|
|
struct nlattr *encap,
|
|
struct lwtunnel_state **lws);
|
|
int lwtunnel_fill_encap(struct sk_buff *skb,
|
|
struct lwtunnel_state *lwtstate);
|
|
int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate);
|
|
struct lwtunnel_state *lwtunnel_state_alloc(int hdr_len);
|
|
int lwtunnel_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b);
|
|
int lwtunnel_output(struct sock *sk, struct sk_buff *skb);
|
|
int lwtunnel_output6(struct sock *sk, struct sk_buff *skb);
|
|
int lwtunnel_input(struct sk_buff *skb);
|
|
int lwtunnel_input6(struct sk_buff *skb);
|
|
|
|
#else
|
|
|
|
static inline void lwtstate_free(struct lwtunnel_state *lws)
|
|
{
|
|
}
|
|
|
|
static inline struct lwtunnel_state *
|
|
lwtstate_get(struct lwtunnel_state *lws)
|
|
{
|
|
return lws;
|
|
}
|
|
|
|
static inline void lwtstate_put(struct lwtunnel_state *lws)
|
|
{
|
|
}
|
|
|
|
static inline bool lwtunnel_output_redirect(struct lwtunnel_state *lwtstate)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline bool lwtunnel_input_redirect(struct lwtunnel_state *lwtstate)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline int lwtunnel_encap_add_ops(const struct lwtunnel_encap_ops *op,
|
|
unsigned int num)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
static inline int lwtunnel_encap_del_ops(const struct lwtunnel_encap_ops *op,
|
|
unsigned int num)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int lwtunnel_build_state(struct net_device *dev, u16 encap_type,
|
|
struct nlattr *encap,
|
|
struct lwtunnel_state **lws)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int lwtunnel_fill_encap(struct sk_buff *skb,
|
|
struct lwtunnel_state *lwtstate)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline struct lwtunnel_state *lwtunnel_state_alloc(int hdr_len)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline int lwtunnel_cmp_encap(struct lwtunnel_state *a,
|
|
struct lwtunnel_state *b)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int lwtunnel_output(struct sock *sk, struct sk_buff *skb)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int lwtunnel_output6(struct sock *sk, struct sk_buff *skb)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int lwtunnel_input(struct sk_buff *skb)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static inline int lwtunnel_input6(struct sk_buff *skb)
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* __NET_LWTUNNEL_H */
|