![Florian Westphal](/assets/img/avatar_default.png)
This is now a fixed-size extension, so we don't need to pass a variable
alloc size. This (harmless) error results in allocating 32 instead of
the needed 16 bytes for this extension as the size gets passed twice.
Fixes: 23014011ba
("netfilter: conntrack: support a fixed size of 128 distinct labels")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
53 lines
1.5 KiB
C
53 lines
1.5 KiB
C
#include <linux/types.h>
|
|
#include <net/net_namespace.h>
|
|
#include <linux/netfilter/nf_conntrack_common.h>
|
|
#include <linux/netfilter/nf_conntrack_tuple_common.h>
|
|
#include <net/netfilter/nf_conntrack.h>
|
|
#include <net/netfilter/nf_conntrack_extend.h>
|
|
|
|
#include <uapi/linux/netfilter/xt_connlabel.h>
|
|
|
|
#define NF_CT_LABELS_MAX_SIZE ((XT_CONNLABEL_MAXBIT + 1) / BITS_PER_BYTE)
|
|
|
|
struct nf_conn_labels {
|
|
unsigned long bits[NF_CT_LABELS_MAX_SIZE / sizeof(long)];
|
|
};
|
|
|
|
static inline struct nf_conn_labels *nf_ct_labels_find(const struct nf_conn *ct)
|
|
{
|
|
#ifdef CONFIG_NF_CONNTRACK_LABELS
|
|
return nf_ct_ext_find(ct, NF_CT_EXT_LABELS);
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
static inline struct nf_conn_labels *nf_ct_labels_ext_add(struct nf_conn *ct)
|
|
{
|
|
#ifdef CONFIG_NF_CONNTRACK_LABELS
|
|
struct net *net = nf_ct_net(ct);
|
|
|
|
if (net->ct.labels_used == 0)
|
|
return NULL;
|
|
|
|
return nf_ct_ext_add(ct, NF_CT_EXT_LABELS, GFP_ATOMIC);
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
int nf_connlabels_replace(struct nf_conn *ct,
|
|
const u32 *data, const u32 *mask, unsigned int words);
|
|
|
|
#ifdef CONFIG_NF_CONNTRACK_LABELS
|
|
int nf_conntrack_labels_init(void);
|
|
void nf_conntrack_labels_fini(void);
|
|
int nf_connlabels_get(struct net *net, unsigned int bit);
|
|
void nf_connlabels_put(struct net *net);
|
|
#else
|
|
static inline int nf_conntrack_labels_init(void) { return 0; }
|
|
static inline void nf_conntrack_labels_fini(void) {}
|
|
static inline int nf_connlabels_get(struct net *net, unsigned int bit) { return 0; }
|
|
static inline void nf_connlabels_put(struct net *net) {}
|
|
#endif
|