Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 549d2d41 authored by Julia Lawall's avatar Julia Lawall Committed by Pablo Neira Ayuso
Browse files

netfilter: constify nf_loginfo structures 



The nf_loginfo structures are only passed as the seventh argument to
nf_log_trace, which is declared as const or stored in a local const
variable.  Thus the nf_loginfo structures themselves can be const.

Done with the help of Coccinelle.

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

@ok1@
identifier r.i;
expression list[6] es;
position p;
@@
 nf_log_trace(es,&i@p,...)

@ok2@
identifier r.i;
const struct nf_loginfo *e;
position p;
@@
 e = &i@p

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

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

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2a04aabf

net/ipv4/netfilter/ip_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static const char *const comments[] = { 
	[NF_IP_TRACE_COMMENT_POLICY]	= "policy",

};



static struct nf_loginfo trace_loginfo = {

static const struct nf_loginfo trace_loginfo = {

	.type = NF_LOG_TYPE_LOG,

	.u = {

		.log = {

net/ipv4/netfilter/nf_log_arp.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/netfilter/xt_LOG.h>

#include <net/netfilter/nf_log.h>



static struct nf_loginfo default_loginfo = {

static const struct nf_loginfo default_loginfo = {

	.type	= NF_LOG_TYPE_LOG,

	.u = {

		.log = {

net/ipv4/netfilter/nf_log_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/netfilter/xt_LOG.h>

#include <net/netfilter/nf_log.h>



static struct nf_loginfo default_loginfo = {

static const struct nf_loginfo default_loginfo = {

	.type	= NF_LOG_TYPE_LOG,

	.u = {

		.log = {

net/ipv6/netfilter/ip6_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static const char *const comments[] = { 
	[NF_IP6_TRACE_COMMENT_POLICY]	= "policy",

};



static struct nf_loginfo trace_loginfo = {

static const struct nf_loginfo trace_loginfo = {

	.type = NF_LOG_TYPE_LOG,

	.u = {

		.log = {

net/ipv6/netfilter/nf_log_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/netfilter/xt_LOG.h>

#include <net/netfilter/nf_log.h>



static struct nf_loginfo default_loginfo = {

static const struct nf_loginfo default_loginfo = {

	.type	= NF_LOG_TYPE_LOG,

	.u = {

		.log = {