[PATCH 2/2] netfilter: ipt_CLUSTERIP: constify nf_hook_ops structures

From	Julia Lawall <Julia.Lawall@lip6.fr>
Newsgroups	linux.kernel
Subject	[PATCH 2/2] netfilter: ipt_CLUSTERIP: constify nf_hook_ops structures
Date	2017-07-29 09:10 +0200
Message-ID	<u8u2R-7fd-1@gated-at.bofh.it> (permalink)
References	<u8u2R-7fd-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The nf_hook_ops structure is only passed as the second argument to
nf_register_net_hook or nf_unregister_net_hook, both of which are
declared as const.  Thus the nf_hook_ops structure itself can be
const.

Done with the help of Coccinelle.

// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct nf_hook_ops i@p = { ... };

@ok1@
identifier r.i;
expression e;
position p;
@@
 \(nf_register_net_hook\|nf_unregister_net_hook\)(e,&i@p)

@bad@
position p != {r.p,ok1.p};
identifier r.i;
struct nf_hook_ops e;
@@
e@i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
 struct nf_hook_ops i = { ... };
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 net/ipv4/netfilter/ipt_CLUSTERIP.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index efaa04d..17b4ca5 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -625,7 +625,7 @@ static void arp_print(struct arp_payload *payload)
 	return NF_ACCEPT;
 }
 
-static struct nf_hook_ops cip_arp_ops __read_mostly = {
+static const struct nf_hook_ops cip_arp_ops = {
 	.hook = arp_mangle,
 	.pf = NFPROTO_ARP,
 	.hooknum = NF_ARP_OUT,

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 2/2] netfilter: ipt_CLUSTERIP: constify nf_hook_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2017-07-29 09:10 +0200

csiph-web