Commit 7c8d4cb4 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nfnetlink: make subsystem and callbacks const 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 169e3674

include/linux/netfilter/nfnetlink.h

+5 −5
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ struct nfnetlink_subsystem 
	const char *name;

	__u8 subsys_id;			/* nfnetlink subsystem ID */

	__u8 cb_count;			/* number of callbacks */

	struct nfnl_callback *cb; /* callback for individual types */

	const struct nfnl_callback *cb;	/* callback for individual types */

};



extern void __nfa_fill(struct sk_buff *skb, int attrtype,
@@ -129,8 +129,8 @@ extern void __nfa_fill(struct sk_buff *skb, int attrtype, 
({ if (skb_tailroom(skb) < (int)NFA_SPACE(attrlen)) goto nfattr_failure; \

   __nfa_fill(skb, attrtype, attrlen, data); })



extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);

extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);

extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);

extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);



extern void nfattr_parse(struct nfattr *tb[], int maxattr, 

			struct nfattr *nfa, int len);

net/netfilter/nf_conntrack_netlink.c

+4 −4
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ static struct notifier_block ctnl_notifier_exp = { 
};

#endif



static struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {

static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {

	[IPCTNL_MSG_CT_NEW]		= { .call = ctnetlink_new_conntrack,

					    .attr_count = CTA_MAX, },

	[IPCTNL_MSG_CT_GET] 		= { .call = ctnetlink_get_conntrack,
@@ -1559,7 +1559,7 @@ static struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = { 
					    .attr_count = CTA_MAX, },

};



static struct nfnl_callback ctnl_exp_cb[IPCTNL_MSG_EXP_MAX] = {

static const struct nfnl_callback ctnl_exp_cb[IPCTNL_MSG_EXP_MAX] = {

	[IPCTNL_MSG_EXP_GET]		= { .call = ctnetlink_get_expect,

					    .attr_count = CTA_EXPECT_MAX, },

	[IPCTNL_MSG_EXP_NEW]		= { .call = ctnetlink_new_expect,
@@ -1568,14 +1568,14 @@ static struct nfnl_callback ctnl_exp_cb[IPCTNL_MSG_EXP_MAX] = { 
					    .attr_count = CTA_EXPECT_MAX, },

};



static struct nfnetlink_subsystem ctnl_subsys = {

static const struct nfnetlink_subsystem ctnl_subsys = {

	.name				= "conntrack",

	.subsys_id			= NFNL_SUBSYS_CTNETLINK,

	.cb_count			= IPCTNL_MSG_MAX,

	.cb				= ctnl_cb,

};



static struct nfnetlink_subsystem ctnl_exp_subsys = {

static const struct nfnetlink_subsystem ctnl_exp_subsys = {

	.name				= "conntrack_expect",

	.subsys_id			= NFNL_SUBSYS_CTNETLINK_EXP,

	.cb_count			= IPCTNL_MSG_EXP_MAX,

net/netfilter/nfnetlink.c

+9 −9
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_NETFILTER); 
static char __initdata nfversion[] = "0.30";



static struct sock *nfnl = NULL;

static struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];

static const struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];

static DEFINE_MUTEX(nfnl_mutex);



static void nfnl_lock(void)
@@ -66,7 +66,7 @@ static void nfnl_unlock(void) 
		nfnl->sk_data_ready(nfnl, 0);

}



int nfnetlink_subsys_register(struct nfnetlink_subsystem *n)

int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)

{

	nfnl_lock();

	if (subsys_table[n->subsys_id]) {
@@ -80,7 +80,7 @@ int nfnetlink_subsys_register(struct nfnetlink_subsystem *n) 
}

EXPORT_SYMBOL_GPL(nfnetlink_subsys_register);



int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n)

int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n)

{

	nfnl_lock();

	subsys_table[n->subsys_id] = NULL;
@@ -90,7 +90,7 @@ int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n) 
}

EXPORT_SYMBOL_GPL(nfnetlink_subsys_unregister);



static inline struct nfnetlink_subsystem *nfnetlink_get_subsys(u_int16_t type)

static inline const struct nfnetlink_subsystem *nfnetlink_get_subsys(u_int16_t type)

{

	u_int8_t subsys_id = NFNL_SUBSYS_ID(type);
@@ -100,8 +100,8 @@ static inline struct nfnetlink_subsystem *nfnetlink_get_subsys(u_int16_t type) 
	return subsys_table[subsys_id];

}



static inline struct nfnl_callback *

nfnetlink_find_client(u_int16_t type, struct nfnetlink_subsystem *ss)

static inline const struct nfnl_callback *

nfnetlink_find_client(u_int16_t type, const struct nfnetlink_subsystem *ss)

{

	u_int8_t cb_id = NFNL_MSG_TYPE(type);
@@ -147,7 +147,7 @@ EXPORT_SYMBOL_GPL(nfattr_parse); 
 *

 */

static int

nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,

nfnetlink_check_attributes(const struct nfnetlink_subsystem *subsys,

			   struct nlmsghdr *nlh, struct nfattr *cda[])

{

	int min_len = NLMSG_SPACE(sizeof(struct nfgenmsg));
@@ -197,8 +197,8 @@ EXPORT_SYMBOL_GPL(nfnetlink_unicast); 
/* Process one complete nfnetlink message. */

static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)

{

	struct nfnl_callback *nc;

	struct nfnetlink_subsystem *ss;

	const struct nfnl_callback *nc;

	const struct nfnetlink_subsystem *ss;

	int type, err;



	if (security_netlink_recv(skb, CAP_NET_ADMIN))

net/netfilter/nfnetlink_log.c

+2 −2
Original line number Diff line number Diff line
@@ -883,14 +883,14 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, 
	return ret;

}



static struct nfnl_callback nfulnl_cb[NFULNL_MSG_MAX] = {

static const struct nfnl_callback nfulnl_cb[NFULNL_MSG_MAX] = {

	[NFULNL_MSG_PACKET]	= { .call = nfulnl_recv_unsupp,

				    .attr_count = NFULA_MAX, },

	[NFULNL_MSG_CONFIG]	= { .call = nfulnl_recv_config,

				    .attr_count = NFULA_CFG_MAX, },

};



static struct nfnetlink_subsystem nfulnl_subsys = {

static const struct nfnetlink_subsystem nfulnl_subsys = {

	.name		= "log",

	.subsys_id	= NFNL_SUBSYS_ULOG,

	.cb_count	= NFULNL_MSG_MAX,

net/netfilter/nfnetlink_queue.c

+2 −2
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb, 
	return ret;

}



static struct nfnl_callback nfqnl_cb[NFQNL_MSG_MAX] = {

static const struct nfnl_callback nfqnl_cb[NFQNL_MSG_MAX] = {

	[NFQNL_MSG_PACKET]	= { .call = nfqnl_recv_unsupp,

				    .attr_count = NFQA_MAX, },

	[NFQNL_MSG_VERDICT]	= { .call = nfqnl_recv_verdict,
@@ -970,7 +970,7 @@ static struct nfnl_callback nfqnl_cb[NFQNL_MSG_MAX] = { 
				    .attr_count = NFQA_CFG_MAX, },

};



static struct nfnetlink_subsystem nfqnl_subsys = {

static const struct nfnetlink_subsystem nfqnl_subsys = {

	.name		= "nf_queue",

	.subsys_id	= NFNL_SUBSYS_QUEUE,

	.cb_count	= NFQNL_MSG_MAX,