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

Commit 2f0d2f10 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[NETFILTER]: conntrack: get rid of sparse warnings 



Teach sparse about locking here, and fix signed/unsigned warnings.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e26fe26

net/netfilter/nf_conntrack_irc.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


#define MAX_PORTS 8

static unsigned short ports[MAX_PORTS];

static int ports_c;

static unsigned int ports_c;

static unsigned int max_dcc_channels = 8;

static unsigned int dcc_timeout __read_mostly = 300;

/* This is slow, but it's simple. --RR */

net/netfilter/nf_conntrack_proto_sctp.c

+2 −2
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = { 
#endif

};



int __init nf_conntrack_proto_sctp_init(void)

static int __init nf_conntrack_proto_sctp_init(void)

{

	int ret;
@@ -647,7 +647,7 @@ int __init nf_conntrack_proto_sctp_init(void) 
	return ret;

}



void __exit nf_conntrack_proto_sctp_fini(void)

static void __exit nf_conntrack_proto_sctp_fini(void)

{

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp6);

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp4);

net/netfilter/nf_conntrack_proto_tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -1098,16 +1098,16 @@ static const struct nla_policy tcp_nla_policy[CTA_PROTOINFO_TCP_MAX+1] = { 


static int nlattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct)

{

	struct nlattr *attr = cda[CTA_PROTOINFO_TCP];

	struct nlattr *pattr = cda[CTA_PROTOINFO_TCP];

	struct nlattr *tb[CTA_PROTOINFO_TCP_MAX+1];

	int err;



	/* updates could not contain anything about the private

	 * protocol info, in that case skip the parsing */

	if (!attr)

	if (!pattr)

		return 0;



	err = nla_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr, tcp_nla_policy);

	err = nla_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, pattr, tcp_nla_policy);

	if (err < 0)

		return err;

net/netfilter/nf_conntrack_sip.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ MODULE_ALIAS("ip_conntrack_sip"); 


#define MAX_PORTS	8

static unsigned short ports[MAX_PORTS];

static int ports_c;

static unsigned int ports_c;

module_param_array(ports, ushort, &ports_c, 0400);

MODULE_PARM_DESC(ports, "port numbers of SIP servers");
@@ -407,7 +407,7 @@ static int sip_help(struct sk_buff *skb, 
	unsigned int dataoff, datalen;

	const char *dptr;

	int ret = NF_ACCEPT;

	int matchoff, matchlen;

	unsigned int matchoff, matchlen;

	u_int16_t port;

	enum sip_header_pos pos;

	typeof(nf_nat_sip_hook) nf_nat_sip;

net/netfilter/nf_conntrack_standalone.c

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static struct hlist_node *ct_get_idx(struct seq_file *seq, loff_t pos) 
}



static void *ct_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(nf_conntrack_lock)

{

	read_lock_bh(&nf_conntrack_lock);

	return ct_get_idx(seq, *pos);
@@ -105,6 +106,7 @@ static void *ct_seq_next(struct seq_file *s, void *v, loff_t *pos) 
}



static void ct_seq_stop(struct seq_file *s, void *v)

	__releases(nf_conntrack_lock)

{

	read_unlock_bh(&nf_conntrack_lock);

}