Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NETFILTER]: nfnetlink: rename functions containing 'nfattr'

Browse source 
There is no struct nfattr anymore, rename functions to 'nlattr'.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-09-28 14:37:41 -07:00 committed by David S. Miller
parent df6fb868d6
commit fdf708322d
22 changed files with 101 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/netfilter/nfnetlink.h
View file

@ -72,7 +72,7 @@ struct nfnetlink_subsystem
extern int nfnetlink_subsys_register(const 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 int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
#define nfattr_bad_size(tb, max, cta_min) \ #define nlattr_bad_size(tb, max, cta_min) \
({ int __i, __res = 0; \ ({ int __i, __res = 0; \
for (__i=1; __i <= max; __i++) { \ for (__i=1; __i <= max; __i++) { \
if (!cta_min[__i]) \ if (!cta_min[__i]) \

2
include/net/netfilter/nf_conntrack_helper.h
View file

@ -36,7 +36,7 @@ struct nf_conntrack_helper
void (*destroy)(struct nf_conn *ct); void (*destroy)(struct nf_conn *ct);
int (*to_nfattr)(struct sk_buff *skb, const struct nf_conn *ct); int (*to_nlattr)(struct sk_buff *skb, const struct nf_conn *ct);
}; };
extern struct nf_conntrack_helper * extern struct nf_conntrack_helper *

4
include/net/netfilter/nf_conntrack_l3proto.h
View file

@ -63,10 +63,10 @@ struct nf_conntrack_l3proto
int (*get_l4proto)(const struct sk_buff *skb, unsigned int nhoff, int (*get_l4proto)(const struct sk_buff *skb, unsigned int nhoff,
unsigned int *dataoff, u_int8_t *protonum); unsigned int *dataoff, u_int8_t *protonum);
int (*tuple_to_nfattr)(struct sk_buff *skb, int (*tuple_to_nlattr)(struct sk_buff *skb,
const struct nf_conntrack_tuple *t); const struct nf_conntrack_tuple *t);
int (*nfattr_to_tuple)(struct nlattr *tb[], int (*nlattr_to_tuple)(struct nlattr *tb[],
struct nf_conntrack_tuple *t); struct nf_conntrack_tuple *t);
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL

12
include/net/netfilter/nf_conntrack_l4proto.h
View file

@ -65,15 +65,15 @@ struct nf_conntrack_l4proto
int pf, unsigned int hooknum); int pf, unsigned int hooknum);
/* convert protoinfo to nfnetink attributes */ /* convert protoinfo to nfnetink attributes */
int (*to_nfattr)(struct sk_buff *skb, struct nlattr *nla, int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,
const struct nf_conn *ct); const struct nf_conn *ct);
/* convert nfnetlink attributes to protoinfo */ /* convert nfnetlink attributes to protoinfo */
int (*from_nfattr)(struct nlattr *tb[], struct nf_conn *ct); int (*from_nlattr)(struct nlattr *tb[], struct nf_conn *ct);
int (*tuple_to_nfattr)(struct sk_buff *skb, int (*tuple_to_nlattr)(struct sk_buff *skb,
const struct nf_conntrack_tuple *t); const struct nf_conntrack_tuple *t);
int (*nfattr_to_tuple)(struct nlattr *tb[], int (*nlattr_to_tuple)(struct nlattr *tb[],
struct nf_conntrack_tuple *t); struct nf_conntrack_tuple *t);
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
@ -111,9 +111,9 @@ extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto); extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
/* Generic netlink helpers */ /* Generic netlink helpers */
extern int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb, extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *tuple); const struct nf_conntrack_tuple *tuple);
extern int nf_ct_port_nfattr_to_tuple(struct nlattr *tb[], extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
struct nf_conntrack_tuple *t); struct nf_conntrack_tuple *t);
/* Log invalid packets */ /* Log invalid packets */

8
include/net/netfilter/nf_nat_protocol.h
View file

@ -38,10 +38,10 @@ struct nf_nat_protocol
enum nf_nat_manip_type maniptype, enum nf_nat_manip_type maniptype,
const struct nf_conn *ct); const struct nf_conn *ct);
int (*range_to_nfattr)(struct sk_buff *skb, int (*range_to_nlattr)(struct sk_buff *skb,
const struct nf_nat_range *range); const struct nf_nat_range *range);
int (*nfattr_to_range)(struct nlattr *tb[], int (*nlattr_to_range)(struct nlattr *tb[],
struct nf_nat_range *range); struct nf_nat_range *range);
}; };
@ -62,9 +62,9 @@ extern int init_protocols(void) __init;
extern void cleanup_protocols(void); extern void cleanup_protocols(void);
extern struct nf_nat_protocol *find_nat_proto(u_int16_t protonum); extern struct nf_nat_protocol *find_nat_proto(u_int16_t protonum);
extern int nf_nat_port_range_to_nfattr(struct sk_buff *skb, extern int nf_nat_port_range_to_nlattr(struct sk_buff *skb,
const struct nf_nat_range *range); const struct nf_nat_range *range);
extern int nf_nat_port_nfattr_to_range(struct nlattr *tb[], extern int nf_nat_port_nlattr_to_range(struct nlattr *tb[],
struct nf_nat_range *range); struct nf_nat_range *range);
#endif /*_NF_NAT_PROTO_H*/ #endif /*_NF_NAT_PROTO_H*/

10
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
View file

@ -360,7 +360,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)
#include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h> #include <linux/netfilter/nfnetlink_conntrack.h>
static int ipv4_tuple_to_nfattr(struct sk_buff *skb, static int ipv4_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *tuple) const struct nf_conntrack_tuple *tuple)
{ {
NLA_PUT(skb, CTA_IP_V4_SRC, sizeof(u_int32_t), NLA_PUT(skb, CTA_IP_V4_SRC, sizeof(u_int32_t),
@ -378,13 +378,13 @@ static const size_t cta_min_ip[CTA_IP_MAX+1] = {
[CTA_IP_V4_DST] = sizeof(u_int32_t), [CTA_IP_V4_DST] = sizeof(u_int32_t),
}; };
static int ipv4_nfattr_to_tuple(struct nlattr *tb[], static int ipv4_nlattr_to_tuple(struct nlattr *tb[],
struct nf_conntrack_tuple *t) struct nf_conntrack_tuple *t)
{ {
if (!tb[CTA_IP_V4_SRC] || !tb[CTA_IP_V4_DST]) if (!tb[CTA_IP_V4_SRC] || !tb[CTA_IP_V4_DST])
return -EINVAL; return -EINVAL;
if (nfattr_bad_size(tb, CTA_IP_MAX, cta_min_ip)) if (nlattr_bad_size(tb, CTA_IP_MAX, cta_min_ip))
return -EINVAL; return -EINVAL;
t->src.u3.ip = *(__be32 *)nla_data(tb[CTA_IP_V4_SRC]); t->src.u3.ip = *(__be32 *)nla_data(tb[CTA_IP_V4_SRC]);
@ -411,8 +411,8 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {
.print_conntrack = ipv4_print_conntrack, .print_conntrack = ipv4_print_conntrack,
.get_l4proto = ipv4_get_l4proto, .get_l4proto = ipv4_get_l4proto,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = ipv4_tuple_to_nfattr, .tuple_to_nlattr = ipv4_tuple_to_nlattr,
.nfattr_to_tuple = ipv4_nfattr_to_tuple, .nlattr_to_tuple = ipv4_nlattr_to_tuple,
#endif #endif
#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT) #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
.ctl_table_path = nf_net_ipv4_netfilter_sysctl_path, .ctl_table_path = nf_net_ipv4_netfilter_sysctl_path,

10
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
View file

@ -232,7 +232,7 @@ icmp_error(struct sk_buff *skb, unsigned int dataoff,
#include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h> #include <linux/netfilter/nfnetlink_conntrack.h>
static int icmp_tuple_to_nfattr(struct sk_buff *skb, static int icmp_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *t) const struct nf_conntrack_tuple *t)
{ {
NLA_PUT(skb, CTA_PROTO_ICMP_ID, sizeof(u_int16_t), NLA_PUT(skb, CTA_PROTO_ICMP_ID, sizeof(u_int16_t),
@ -254,7 +254,7 @@ static const size_t cta_min_proto[CTA_PROTO_MAX+1] = {
[CTA_PROTO_ICMP_ID] = sizeof(u_int16_t) [CTA_PROTO_ICMP_ID] = sizeof(u_int16_t)
}; };
static int icmp_nfattr_to_tuple(struct nlattr *tb[], static int icmp_nlattr_to_tuple(struct nlattr *tb[],
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
if (!tb[CTA_PROTO_ICMP_TYPE] if (!tb[CTA_PROTO_ICMP_TYPE]
@ -262,7 +262,7 @@ static int icmp_nfattr_to_tuple(struct nlattr *tb[],
|| !tb[CTA_PROTO_ICMP_ID]) || !tb[CTA_PROTO_ICMP_ID])
return -EINVAL; return -EINVAL;
if (nfattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto)) if (nlattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto))
return -EINVAL; return -EINVAL;
tuple->dst.u.icmp.type = tuple->dst.u.icmp.type =
@ -327,8 +327,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =
.destroy = NULL, .destroy = NULL,
.me = NULL, .me = NULL,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = icmp_tuple_to_nfattr, .tuple_to_nlattr = icmp_tuple_to_nlattr,
.nfattr_to_tuple = icmp_nfattr_to_tuple, .nlattr_to_tuple = icmp_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_header = &icmp_sysctl_header, .ctl_table_header = &icmp_sysctl_header,

8
net/ipv4/netfilter/nf_nat_core.c
View file

@ -544,7 +544,7 @@ EXPORT_SYMBOL(nf_nat_protocol_unregister);
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
int int
nf_nat_port_range_to_nfattr(struct sk_buff *skb, nf_nat_port_range_to_nlattr(struct sk_buff *skb,
const struct nf_nat_range *range) const struct nf_nat_range *range)
{ {
NLA_PUT(skb, CTA_PROTONAT_PORT_MIN, sizeof(__be16), NLA_PUT(skb, CTA_PROTONAT_PORT_MIN, sizeof(__be16),
@ -557,10 +557,10 @@ nf_nat_port_range_to_nfattr(struct sk_buff *skb,
nla_put_failure: nla_put_failure:
return -1; return -1;
} }
EXPORT_SYMBOL_GPL(nf_nat_port_nfattr_to_range); EXPORT_SYMBOL_GPL(nf_nat_port_nlattr_to_range);
int int
nf_nat_port_nfattr_to_range(struct nlattr *tb[], struct nf_nat_range *range) nf_nat_port_nlattr_to_range(struct nlattr *tb[], struct nf_nat_range *range)
{ {
int ret = 0; int ret = 0;
@ -583,7 +583,7 @@ nf_nat_port_nfattr_to_range(struct nlattr *tb[], struct nf_nat_range *range)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(nf_nat_port_range_to_nfattr); EXPORT_SYMBOL_GPL(nf_nat_port_range_to_nlattr);
#endif #endif
/* Noone using conntrack by the time this called. */ /* Noone using conntrack by the time this called. */

4
net/ipv4/netfilter/nf_nat_proto_gre.c
View file

@ -142,8 +142,8 @@ static struct nf_nat_protocol gre __read_mostly = {
.in_range = gre_in_range, .in_range = gre_in_range,
.unique_tuple = gre_unique_tuple, .unique_tuple = gre_unique_tuple,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.range_to_nfattr = nf_nat_port_range_to_nfattr, .range_to_nlattr = nf_nat_port_range_to_nlattr,
.nfattr_to_range = nf_nat_port_nfattr_to_range, .nlattr_to_range = nf_nat_port_nlattr_to_range,
#endif #endif
}; };

4
net/ipv4/netfilter/nf_nat_proto_icmp.c
View file

@ -79,7 +79,7 @@ struct nf_nat_protocol nf_nat_protocol_icmp = {
.in_range = icmp_in_range, .in_range = icmp_in_range,
.unique_tuple = icmp_unique_tuple, .unique_tuple = icmp_unique_tuple,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.range_to_nfattr = nf_nat_port_range_to_nfattr, .range_to_nlattr = nf_nat_port_range_to_nlattr,
.nfattr_to_range = nf_nat_port_nfattr_to_range, .nlattr_to_range = nf_nat_port_nlattr_to_range,
#endif #endif
}; };

4
net/ipv4/netfilter/nf_nat_proto_tcp.c
View file

@ -145,7 +145,7 @@ struct nf_nat_protocol nf_nat_protocol_tcp = {
.in_range = tcp_in_range, .in_range = tcp_in_range,
.unique_tuple = tcp_unique_tuple, .unique_tuple = tcp_unique_tuple,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.range_to_nfattr = nf_nat_port_range_to_nfattr, .range_to_nlattr = nf_nat_port_range_to_nlattr,
.nfattr_to_range = nf_nat_port_nfattr_to_range, .nlattr_to_range = nf_nat_port_nlattr_to_range,
#endif #endif
}; };

4
net/ipv4/netfilter/nf_nat_proto_udp.c
View file

@ -135,7 +135,7 @@ struct nf_nat_protocol nf_nat_protocol_udp = {
.in_range = udp_in_range, .in_range = udp_in_range,
.unique_tuple = udp_unique_tuple, .unique_tuple = udp_unique_tuple,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.range_to_nfattr = nf_nat_port_range_to_nfattr, .range_to_nlattr = nf_nat_port_range_to_nlattr,
.nfattr_to_range = nf_nat_port_nfattr_to_range, .nlattr_to_range = nf_nat_port_nlattr_to_range,
#endif #endif
}; };

10
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
View file

@ -337,7 +337,7 @@ static ctl_table nf_ct_ipv6_sysctl_table[] = {
#include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h> #include <linux/netfilter/nfnetlink_conntrack.h>
static int ipv6_tuple_to_nfattr(struct sk_buff *skb, static int ipv6_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *tuple) const struct nf_conntrack_tuple *tuple)
{ {
NLA_PUT(skb, CTA_IP_V6_SRC, sizeof(u_int32_t) * 4, NLA_PUT(skb, CTA_IP_V6_SRC, sizeof(u_int32_t) * 4,
@ -355,13 +355,13 @@ static const size_t cta_min_ip[CTA_IP_MAX+1] = {
[CTA_IP_V6_DST] = sizeof(u_int32_t)*4, [CTA_IP_V6_DST] = sizeof(u_int32_t)*4,
}; };
static int ipv6_nfattr_to_tuple(struct nlattr *tb[], static int ipv6_nlattr_to_tuple(struct nlattr *tb[],
struct nf_conntrack_tuple *t) struct nf_conntrack_tuple *t)
{ {
if (!tb[CTA_IP_V6_SRC] || !tb[CTA_IP_V6_DST]) if (!tb[CTA_IP_V6_SRC] || !tb[CTA_IP_V6_DST])
return -EINVAL; return -EINVAL;
if (nfattr_bad_size(tb, CTA_IP_MAX, cta_min_ip)) if (nlattr_bad_size(tb, CTA_IP_MAX, cta_min_ip))
return -EINVAL; return -EINVAL;
memcpy(&t->src.u3.ip6, nla_data(tb[CTA_IP_V6_SRC]), memcpy(&t->src.u3.ip6, nla_data(tb[CTA_IP_V6_SRC]),
@ -382,8 +382,8 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {
.print_conntrack = ipv6_print_conntrack, .print_conntrack = ipv6_print_conntrack,
.get_l4proto = ipv6_get_l4proto, .get_l4proto = ipv6_get_l4proto,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = ipv6_tuple_to_nfattr, .tuple_to_nlattr = ipv6_tuple_to_nlattr,
.nfattr_to_tuple = ipv6_nfattr_to_tuple, .nlattr_to_tuple = ipv6_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_path = nf_net_netfilter_sysctl_path, .ctl_table_path = nf_net_netfilter_sysctl_path,

10
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
View file

@ -210,7 +210,7 @@ icmpv6_error(struct sk_buff *skb, unsigned int dataoff,
#include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h> #include <linux/netfilter/nfnetlink_conntrack.h>
static int icmpv6_tuple_to_nfattr(struct sk_buff *skb, static int icmpv6_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *t) const struct nf_conntrack_tuple *t)
{ {
NLA_PUT(skb, CTA_PROTO_ICMPV6_ID, sizeof(u_int16_t), NLA_PUT(skb, CTA_PROTO_ICMPV6_ID, sizeof(u_int16_t),
@ -232,7 +232,7 @@ static const size_t cta_min_proto[CTA_PROTO_MAX+1] = {
[CTA_PROTO_ICMPV6_ID] = sizeof(u_int16_t) [CTA_PROTO_ICMPV6_ID] = sizeof(u_int16_t)
}; };
static int icmpv6_nfattr_to_tuple(struct nlattr *tb[], static int icmpv6_nlattr_to_tuple(struct nlattr *tb[],
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
if (!tb[CTA_PROTO_ICMPV6_TYPE] if (!tb[CTA_PROTO_ICMPV6_TYPE]
@ -240,7 +240,7 @@ static int icmpv6_nfattr_to_tuple(struct nlattr *tb[],
|| !tb[CTA_PROTO_ICMPV6_ID]) || !tb[CTA_PROTO_ICMPV6_ID])
return -EINVAL; return -EINVAL;
if (nfattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto)) if (nlattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto))
return -EINVAL; return -EINVAL;
tuple->dst.u.icmp.type = tuple->dst.u.icmp.type =
@ -289,8 +289,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =
.new = icmpv6_new, .new = icmpv6_new,
.error = icmpv6_error, .error = icmpv6_error,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = icmpv6_tuple_to_nfattr, .tuple_to_nlattr = icmpv6_tuple_to_nlattr,
.nfattr_to_tuple = icmpv6_nfattr_to_tuple, .nlattr_to_tuple = icmpv6_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_header = &icmpv6_sysctl_header, .ctl_table_header = &icmpv6_sysctl_header,

10
net/netfilter/nf_conntrack_core.c
View file

@ -830,7 +830,7 @@ EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct);
/* Generic function for tcp/udp/sctp/dccp and alike. This needs to be /* Generic function for tcp/udp/sctp/dccp and alike. This needs to be
* in ip_conntrack_core, since we don't want the protocols to autoload * in ip_conntrack_core, since we don't want the protocols to autoload
* or depend on ctnetlink */ * or depend on ctnetlink */
int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb, int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *tuple) const struct nf_conntrack_tuple *tuple)
{ {
NLA_PUT(skb, CTA_PROTO_SRC_PORT, sizeof(u_int16_t), NLA_PUT(skb, CTA_PROTO_SRC_PORT, sizeof(u_int16_t),
@ -842,20 +842,20 @@ int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb,
nla_put_failure: nla_put_failure:
return -1; return -1;
} }
EXPORT_SYMBOL_GPL(nf_ct_port_tuple_to_nfattr); EXPORT_SYMBOL_GPL(nf_ct_port_tuple_to_nlattr);
static const size_t cta_min_proto[CTA_PROTO_MAX+1] = { static const size_t cta_min_proto[CTA_PROTO_MAX+1] = {
[CTA_PROTO_SRC_PORT] = sizeof(u_int16_t), [CTA_PROTO_SRC_PORT] = sizeof(u_int16_t),
[CTA_PROTO_DST_PORT] = sizeof(u_int16_t) [CTA_PROTO_DST_PORT] = sizeof(u_int16_t)
}; };
int nf_ct_port_nfattr_to_tuple(struct nlattr *tb[], int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
struct nf_conntrack_tuple *t) struct nf_conntrack_tuple *t)
{ {
if (!tb[CTA_PROTO_SRC_PORT] || !tb[CTA_PROTO_DST_PORT]) if (!tb[CTA_PROTO_SRC_PORT] || !tb[CTA_PROTO_DST_PORT])
return -EINVAL; return -EINVAL;
if (nfattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto)) if (nlattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto))
return -EINVAL; return -EINVAL;
t->src.u.tcp.port = *(__be16 *)nla_data(tb[CTA_PROTO_SRC_PORT]); t->src.u.tcp.port = *(__be16 *)nla_data(tb[CTA_PROTO_SRC_PORT]);
@ -863,7 +863,7 @@ int nf_ct_port_nfattr_to_tuple(struct nlattr *tb[],
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(nf_ct_port_nfattr_to_tuple); EXPORT_SYMBOL_GPL(nf_ct_port_nlattr_to_tuple);
#endif #endif
/* Used by ipt_REJECT and ip6t_REJECT. */ /* Used by ipt_REJECT and ip6t_REJECT. */

52
net/netfilter/nf_conntrack_netlink.c
View file

@ -61,8 +61,8 @@ ctnetlink_dump_tuples_proto(struct sk_buff *skb,
goto nla_put_failure; goto nla_put_failure;
NLA_PUT(skb, CTA_PROTO_NUM, sizeof(u_int8_t), &tuple->dst.protonum); NLA_PUT(skb, CTA_PROTO_NUM, sizeof(u_int8_t), &tuple->dst.protonum);
if (likely(l4proto->tuple_to_nfattr)) if (likely(l4proto->tuple_to_nlattr))
ret = l4proto->tuple_to_nfattr(skb, tuple); ret = l4proto->tuple_to_nlattr(skb, tuple);
nla_nest_end(skb, nest_parms); nla_nest_end(skb, nest_parms);
@ -84,8 +84,8 @@ ctnetlink_dump_tuples_ip(struct sk_buff *skb,
if (!nest_parms) if (!nest_parms)
goto nla_put_failure; goto nla_put_failure;
if (likely(l3proto->tuple_to_nfattr)) if (likely(l3proto->tuple_to_nlattr))
ret = l3proto->tuple_to_nfattr(skb, tuple); ret = l3proto->tuple_to_nlattr(skb, tuple);
nla_nest_end(skb, nest_parms); nla_nest_end(skb, nest_parms);
@ -153,7 +153,7 @@ ctnetlink_dump_protoinfo(struct sk_buff *skb, const struct nf_conn *ct)
struct nlattr *nest_proto; struct nlattr *nest_proto;
int ret; int ret;
if (!l4proto->to_nfattr) { if (!l4proto->to_nlattr) {
nf_ct_l4proto_put(l4proto); nf_ct_l4proto_put(l4proto);
return 0; return 0;
} }
@ -162,7 +162,7 @@ ctnetlink_dump_protoinfo(struct sk_buff *skb, const struct nf_conn *ct)
if (!nest_proto) if (!nest_proto)
goto nla_put_failure; goto nla_put_failure;
ret = l4proto->to_nfattr(skb, nest_proto, ct); ret = l4proto->to_nlattr(skb, nest_proto, ct);
nf_ct_l4proto_put(l4proto); nf_ct_l4proto_put(l4proto);
@ -195,8 +195,8 @@ ctnetlink_dump_helpinfo(struct sk_buff *skb, const struct nf_conn *ct)
goto nla_put_failure; goto nla_put_failure;
NLA_PUT(skb, CTA_HELP_NAME, strlen(helper->name), helper->name); NLA_PUT(skb, CTA_HELP_NAME, strlen(helper->name), helper->name);
if (helper->to_nfattr) if (helper->to_nlattr)
helper->to_nfattr(skb, ct); helper->to_nlattr(skb, ct);
nla_nest_end(skb, nest_helper); nla_nest_end(skb, nest_helper);
out: out:
@ -512,8 +512,8 @@ ctnetlink_parse_tuple_ip(struct nlattr *attr, struct nf_conntrack_tuple *tuple)
l3proto = nf_ct_l3proto_find_get(tuple->src.l3num); l3proto = nf_ct_l3proto_find_get(tuple->src.l3num);
if (likely(l3proto->nfattr_to_tuple)) if (likely(l3proto->nlattr_to_tuple))
ret = l3proto->nfattr_to_tuple(tb, tuple); ret = l3proto->nlattr_to_tuple(tb, tuple);
nf_ct_l3proto_put(l3proto); nf_ct_l3proto_put(l3proto);
@ -534,7 +534,7 @@ ctnetlink_parse_tuple_proto(struct nlattr *attr,
nla_parse_nested(tb, CTA_PROTO_MAX, attr, NULL); nla_parse_nested(tb, CTA_PROTO_MAX, attr, NULL);
if (nfattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto)) if (nlattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto))
return -EINVAL; return -EINVAL;
if (!tb[CTA_PROTO_NUM]) if (!tb[CTA_PROTO_NUM])
@ -543,8 +543,8 @@ ctnetlink_parse_tuple_proto(struct nlattr *attr,
l4proto = nf_ct_l4proto_find_get(tuple->src.l3num, tuple->dst.protonum); l4proto = nf_ct_l4proto_find_get(tuple->src.l3num, tuple->dst.protonum);
if (likely(l4proto->nfattr_to_tuple)) if (likely(l4proto->nlattr_to_tuple))
ret = l4proto->nfattr_to_tuple(tb, tuple); ret = l4proto->nlattr_to_tuple(tb, tuple);
nf_ct_l4proto_put(l4proto); nf_ct_l4proto_put(l4proto);
@ -602,18 +602,18 @@ static int nfnetlink_parse_nat_proto(struct nlattr *attr,
nla_parse_nested(tb, CTA_PROTONAT_MAX, attr, NULL); nla_parse_nested(tb, CTA_PROTONAT_MAX, attr, NULL);
if (nfattr_bad_size(tb, CTA_PROTONAT_MAX, cta_min_protonat)) if (nlattr_bad_size(tb, CTA_PROTONAT_MAX, cta_min_protonat))
return -EINVAL; return -EINVAL;
npt = nf_nat_proto_find_get(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum); npt = nf_nat_proto_find_get(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum);
if (!npt->nfattr_to_range) { if (!npt->nlattr_to_range) {
nf_nat_proto_put(npt); nf_nat_proto_put(npt);
return 0; return 0;
} }
/* nfattr_to_range returns 1 if it parsed, 0 if not, neg. on error */ /* nlattr_to_range returns 1 if it parsed, 0 if not, neg. on error */
if (npt->nfattr_to_range(tb, range) > 0) if (npt->nlattr_to_range(tb, range) > 0)
range->flags |= IP_NAT_RANGE_PROTO_SPECIFIED; range->flags |= IP_NAT_RANGE_PROTO_SPECIFIED;
nf_nat_proto_put(npt); nf_nat_proto_put(npt);
@ -637,7 +637,7 @@ nfnetlink_parse_nat(struct nlattr *nat,
nla_parse_nested(tb, CTA_NAT_MAX, nat, NULL); nla_parse_nested(tb, CTA_NAT_MAX, nat, NULL);
if (nfattr_bad_size(tb, CTA_NAT_MAX, cta_min_nat)) if (nlattr_bad_size(tb, CTA_NAT_MAX, cta_min_nat))
return -EINVAL; return -EINVAL;
if (tb[CTA_NAT_MINIP]) if (tb[CTA_NAT_MINIP])
@ -696,7 +696,7 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
u_int8_t u3 = nfmsg->nfgen_family; u_int8_t u3 = nfmsg->nfgen_family;
int err = 0; int err = 0;
if (nfattr_bad_size(cda, CTA_MAX, cta_min)) if (nlattr_bad_size(cda, CTA_MAX, cta_min))
return -EINVAL; return -EINVAL;
if (cda[CTA_TUPLE_ORIG]) if (cda[CTA_TUPLE_ORIG])
@ -754,7 +754,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
ctnetlink_done); ctnetlink_done);
} }
if (nfattr_bad_size(cda, CTA_MAX, cta_min)) if (nlattr_bad_size(cda, CTA_MAX, cta_min))
return -EINVAL; return -EINVAL;
if (cda[CTA_TUPLE_ORIG]) if (cda[CTA_TUPLE_ORIG])
@ -928,8 +928,8 @@ ctnetlink_change_protoinfo(struct nf_conn *ct, struct nlattr *cda[])
l4proto = nf_ct_l4proto_find_get(l3num, npt); l4proto = nf_ct_l4proto_find_get(l3num, npt);
if (l4proto->from_nfattr) if (l4proto->from_nlattr)
err = l4proto->from_nfattr(tb, ct); err = l4proto->from_nlattr(tb, ct);
nf_ct_l4proto_put(l4proto); nf_ct_l4proto_put(l4proto);
return err; return err;
@ -1045,7 +1045,7 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
u_int8_t u3 = nfmsg->nfgen_family; u_int8_t u3 = nfmsg->nfgen_family;
int err = 0; int err = 0;
if (nfattr_bad_size(cda, CTA_MAX, cta_min)) if (nlattr_bad_size(cda, CTA_MAX, cta_min))
return -EINVAL; return -EINVAL;
if (cda[CTA_TUPLE_ORIG]) { if (cda[CTA_TUPLE_ORIG]) {
@ -1329,7 +1329,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,
u_int8_t u3 = nfmsg->nfgen_family; u_int8_t u3 = nfmsg->nfgen_family;
int err = 0; int err = 0;
if (nfattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp)) if (nlattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp))
return -EINVAL; return -EINVAL;
if (nlh->nlmsg_flags & NLM_F_DUMP) { if (nlh->nlmsg_flags & NLM_F_DUMP) {
@ -1393,7 +1393,7 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb,
unsigned int i; unsigned int i;
int err; int err;
if (nfattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp)) if (nlattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp))
return -EINVAL; return -EINVAL;
if (cda[CTA_EXPECT_TUPLE]) { if (cda[CTA_EXPECT_TUPLE]) {
@ -1534,7 +1534,7 @@ ctnetlink_new_expect(struct sock *ctnl, struct sk_buff *skb,
u_int8_t u3 = nfmsg->nfgen_family; u_int8_t u3 = nfmsg->nfgen_family;
int err = 0; int err = 0;
if (nfattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp)) if (nlattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp))
return -EINVAL; return -EINVAL;
if (!cda[CTA_EXPECT_TUPLE] if (!cda[CTA_EXPECT_TUPLE]

4
net/netfilter/nf_conntrack_proto_gre.c
View file

@ -274,8 +274,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = {
.destroy = gre_destroy, .destroy = gre_destroy,
.me = THIS_MODULE, .me = THIS_MODULE,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
#endif #endif
}; };

22
net/netfilter/nf_conntrack_proto_tcp.c
View file

@ -1067,7 +1067,7 @@ static int tcp_new(struct nf_conn *conntrack,
#include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h> #include <linux/netfilter/nfnetlink_conntrack.h>
static int tcp_to_nfattr(struct sk_buff *skb, struct nlattr *nla, static int tcp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
const struct nf_conn *ct) const struct nf_conn *ct)
{ {
struct nlattr *nest_parms; struct nlattr *nest_parms;
@ -1113,7 +1113,7 @@ static const size_t cta_min_tcp[CTA_PROTOINFO_TCP_MAX+1] = {
[CTA_PROTOINFO_TCP_FLAGS_REPLY] = sizeof(struct nf_ct_tcp_flags) [CTA_PROTOINFO_TCP_FLAGS_REPLY] = sizeof(struct nf_ct_tcp_flags)
}; };
static int nfattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct) static int nlattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct)
{ {
struct nlattr *attr = cda[CTA_PROTOINFO_TCP]; struct nlattr *attr = cda[CTA_PROTOINFO_TCP];
struct nlattr *tb[CTA_PROTOINFO_TCP_MAX+1]; struct nlattr *tb[CTA_PROTOINFO_TCP_MAX+1];
@ -1125,7 +1125,7 @@ static int nfattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct)
nla_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr, NULL); nla_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr, NULL);
if (nfattr_bad_size(tb, CTA_PROTOINFO_TCP_MAX, cta_min_tcp)) if (nlattr_bad_size(tb, CTA_PROTOINFO_TCP_MAX, cta_min_tcp))
return -EINVAL; return -EINVAL;
if (!tb[CTA_PROTOINFO_TCP_STATE]) if (!tb[CTA_PROTOINFO_TCP_STATE])
@ -1387,10 +1387,10 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 __read_mostly =
.new = tcp_new, .new = tcp_new,
.error = tcp_error, .error = tcp_error,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.to_nfattr = tcp_to_nfattr, .to_nlattr = tcp_to_nlattr,
.from_nfattr = nfattr_to_tcp, .from_nlattr = nlattr_to_tcp,
.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_users = &tcp_sysctl_table_users, .ctl_table_users = &tcp_sysctl_table_users,
@ -1416,10 +1416,10 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 __read_mostly =
.new = tcp_new, .new = tcp_new,
.error = tcp_error, .error = tcp_error,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.to_nfattr = tcp_to_nfattr, .to_nlattr = tcp_to_nlattr,
.from_nfattr = nfattr_to_tcp, .from_nlattr = nlattr_to_tcp,
.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_users = &tcp_sysctl_table_users, .ctl_table_users = &tcp_sysctl_table_users,

8
net/netfilter/nf_conntrack_proto_udp.c
View file

@ -203,8 +203,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =
.new = udp_new, .new = udp_new,
.error = udp_error, .error = udp_error,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_users = &udp_sysctl_table_users, .ctl_table_users = &udp_sysctl_table_users,
@ -230,8 +230,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =
.new = udp_new, .new = udp_new,
.error = udp_error, .error = udp_error,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_users = &udp_sysctl_table_users, .ctl_table_users = &udp_sysctl_table_users,

8
net/netfilter/nf_conntrack_proto_udplite.c
View file

@ -203,8 +203,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =
.new = udplite_new, .new = udplite_new,
.error = udplite_error, .error = udplite_error,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_users = &udplite_sysctl_table_users, .ctl_table_users = &udplite_sysctl_table_users,
@ -226,8 +226,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =
.new = udplite_new, .new = udplite_new,
.error = udplite_error, .error = udplite_error,
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
.tuple_to_nfattr = nf_ct_port_tuple_to_nfattr, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
.nfattr_to_tuple = nf_ct_port_nfattr_to_tuple, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
#endif #endif
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
.ctl_table_users = &udplite_sysctl_table_users, .ctl_table_users = &udplite_sysctl_table_users,

2
net/netfilter/nfnetlink_log.c
View file

@ -769,7 +769,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
UDEBUG("entering for msg %u\n", NFNL_MSG_TYPE(nlh->nlmsg_type)); UDEBUG("entering for msg %u\n", NFNL_MSG_TYPE(nlh->nlmsg_type));
if (nfattr_bad_size(nfula, NFULA_CFG_MAX, nfula_cfg_min)) { if (nlattr_bad_size(nfula, NFULA_CFG_MAX, nfula_cfg_min)) {
UDEBUG("bad attribute size\n"); UDEBUG("bad attribute size\n");
return -EINVAL; return -EINVAL;
} }

4
net/netfilter/nfnetlink_queue.c
View file

@ -796,7 +796,7 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb,
struct nfqnl_queue_entry *entry; struct nfqnl_queue_entry *entry;
int err; int err;
if (nfattr_bad_size(nfqa, NFQA_MAX, nfqa_verdict_min)) { if (nlattr_bad_size(nfqa, NFQA_MAX, nfqa_verdict_min)) {
QDEBUG("bad attribute size\n"); QDEBUG("bad attribute size\n");
return -EINVAL; return -EINVAL;
} }
@ -876,7 +876,7 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
QDEBUG("entering for msg %u\n", NFNL_MSG_TYPE(nlh->nlmsg_type)); QDEBUG("entering for msg %u\n", NFNL_MSG_TYPE(nlh->nlmsg_type));
if (nfattr_bad_size(nfqa, NFQA_CFG_MAX, nfqa_cfg_min)) { if (nlattr_bad_size(nfqa, NFQA_CFG_MAX, nfqa_cfg_min)) {
QDEBUG("bad attribute size\n"); QDEBUG("bad attribute size\n");
return -EINVAL; return -EINVAL;
} }