forked from Minki/linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains Netfilter updates for your net-next tree: 1) Use lockdep_is_held() in ipset_dereference_protected(), from Lance Roy. 2) Remove unused variable in cttimeout, from YueHaibing. 3) Add ttl option for nft_osf, from Fernando Fernandez Mancera. 4) Use xfrm family to deal with IPv6-in-IPv4 packets from nft_xfrm, from Florian Westphal. 5) Simplify xt_osf_match_packet(). 6) Missing ct helper alias definition in snmp_trap helper, from Taehee Yoo. 7) Remove unnecessary parameter in nf_flow_table_cleanup(), from Taehee Yoo. 8) Remove unused variable definitions in nft_{dup,fwd}, from Weongyo Jeong. 9) Remove empty net/netfilter/nfnetlink_log.h file, from Taehee Yoo. 10) Revert xt_quota updates remain option due to problems in the listing path for 32-bit arches, from Maze. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
a4efbaf622
@ -27,6 +27,7 @@ bool nf_osf_match(const struct sk_buff *skb, u_int8_t family,
|
||||
const struct list_head *nf_osf_fingers);
|
||||
|
||||
const char *nf_osf_find(const struct sk_buff *skb,
|
||||
const struct list_head *nf_osf_fingers);
|
||||
const struct list_head *nf_osf_fingers,
|
||||
const int ttl_check);
|
||||
|
||||
#endif /* _NFOSF_H */
|
||||
|
@ -99,7 +99,7 @@ int nf_flow_table_iterate(struct nf_flowtable *flow_table,
|
||||
void (*iter)(struct flow_offload *flow, void *data),
|
||||
void *data);
|
||||
|
||||
void nf_flow_table_cleanup(struct net *net, struct net_device *dev);
|
||||
void nf_flow_table_cleanup(struct net_device *dev);
|
||||
|
||||
int nf_flow_table_init(struct nf_flowtable *flow_table);
|
||||
void nf_flow_table_free(struct nf_flowtable *flow_table);
|
||||
|
@ -1 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
@ -1511,9 +1511,16 @@ enum nft_flowtable_hook_attributes {
|
||||
};
|
||||
#define NFTA_FLOWTABLE_HOOK_MAX (__NFTA_FLOWTABLE_HOOK_MAX - 1)
|
||||
|
||||
/**
|
||||
* enum nft_osf_attributes - nftables osf expression netlink attributes
|
||||
*
|
||||
* @NFTA_OSF_DREG: destination register (NLA_U32: nft_registers)
|
||||
* @NFTA_OSF_TTL: Value of the TTL osf option (NLA_U8)
|
||||
*/
|
||||
enum nft_osf_attributes {
|
||||
NFTA_OSF_UNSPEC,
|
||||
NFTA_OSF_DREG,
|
||||
NFTA_OSF_TTL,
|
||||
__NFTA_OSF_MAX,
|
||||
};
|
||||
#define NFTA_OSF_MAX (__NFTA_OSF_MAX - 1)
|
||||
|
@ -15,11 +15,9 @@ struct xt_quota_info {
|
||||
__u32 flags;
|
||||
__u32 pad;
|
||||
__aligned_u64 quota;
|
||||
#ifdef __KERNEL__
|
||||
atomic64_t counter;
|
||||
#else
|
||||
__aligned_u64 remain;
|
||||
#endif
|
||||
|
||||
/* Used internally by the kernel */
|
||||
struct xt_quota_priv *master;
|
||||
};
|
||||
|
||||
#endif /* _XT_QUOTA_H */
|
||||
|
@ -60,6 +60,7 @@ MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
|
||||
MODULE_DESCRIPTION("Basic SNMP Application Layer Gateway");
|
||||
MODULE_ALIAS("ip_nat_snmp_basic");
|
||||
MODULE_ALIAS_NFCT_HELPER("snmp_trap");
|
||||
|
||||
#define SNMP_PORT 161
|
||||
#define SNMP_TRAP_PORT 162
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#define __ipset_dereference_protected(p, c) rcu_dereference_protected(p, c)
|
||||
#define ipset_dereference_protected(p, set) \
|
||||
__ipset_dereference_protected(p, spin_is_locked(&(set)->lock))
|
||||
__ipset_dereference_protected(p, lockdep_is_held(&(set)->lock))
|
||||
|
||||
#define rcu_dereference_bh_nfnl(p) rcu_dereference_bh_check(p, 1)
|
||||
|
||||
|
@ -483,7 +483,7 @@ static void nf_flow_table_iterate_cleanup(struct nf_flowtable *flowtable,
|
||||
flush_delayed_work(&flowtable->gc_work);
|
||||
}
|
||||
|
||||
void nf_flow_table_cleanup(struct net *net, struct net_device *dev)
|
||||
void nf_flow_table_cleanup(struct net_device *dev)
|
||||
{
|
||||
struct nf_flowtable *flowtable;
|
||||
|
||||
|
@ -350,7 +350,6 @@ static int cttimeout_default_set(struct net *net, struct sock *ctnl,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
const struct nf_conntrack_l4proto *l4proto;
|
||||
__u16 l3num;
|
||||
__u8 l4num;
|
||||
int ret;
|
||||
|
||||
@ -359,7 +358,6 @@ static int cttimeout_default_set(struct net *net, struct sock *ctnl,
|
||||
!cda[CTA_TIMEOUT_DATA])
|
||||
return -EINVAL;
|
||||
|
||||
l3num = ntohs(nla_get_be16(cda[CTA_TIMEOUT_L3PROTO]));
|
||||
l4num = nla_get_u8(cda[CTA_TIMEOUT_L4PROTO]);
|
||||
l4proto = nf_ct_l4proto_find_get(l4num);
|
||||
|
||||
|
@ -30,32 +30,27 @@ EXPORT_SYMBOL_GPL(nf_osf_fingers);
|
||||
static inline int nf_osf_ttl(const struct sk_buff *skb,
|
||||
int ttl_check, unsigned char f_ttl)
|
||||
{
|
||||
struct in_device *in_dev = __in_dev_get_rcu(skb->dev);
|
||||
const struct iphdr *ip = ip_hdr(skb);
|
||||
int ret = 0;
|
||||
|
||||
if (ttl_check != -1) {
|
||||
if (ttl_check == NF_OSF_TTL_TRUE)
|
||||
return ip->ttl == f_ttl;
|
||||
if (ttl_check == NF_OSF_TTL_NOCHECK)
|
||||
return 1;
|
||||
else if (ip->ttl <= f_ttl)
|
||||
return 1;
|
||||
else {
|
||||
struct in_device *in_dev = __in_dev_get_rcu(skb->dev);
|
||||
int ret = 0;
|
||||
if (ttl_check == NF_OSF_TTL_TRUE)
|
||||
return ip->ttl == f_ttl;
|
||||
if (ttl_check == NF_OSF_TTL_NOCHECK)
|
||||
return 1;
|
||||
else if (ip->ttl <= f_ttl)
|
||||
return 1;
|
||||
|
||||
for_ifa(in_dev) {
|
||||
if (inet_ifa_match(ip->saddr, ifa)) {
|
||||
ret = (ip->ttl == f_ttl);
|
||||
break;
|
||||
}
|
||||
}
|
||||
endfor_ifa(in_dev);
|
||||
|
||||
return ret;
|
||||
for_ifa(in_dev) {
|
||||
if (inet_ifa_match(ip->saddr, ifa)) {
|
||||
ret = (ip->ttl == f_ttl);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return ip->ttl == f_ttl;
|
||||
endfor_ifa(in_dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct nf_osf_hdr_ctx {
|
||||
@ -213,7 +208,7 @@ nf_osf_match(const struct sk_buff *skb, u_int8_t family,
|
||||
if (!tcp)
|
||||
return false;
|
||||
|
||||
ttl_check = (info->flags & NF_OSF_TTL) ? info->ttl : -1;
|
||||
ttl_check = (info->flags & NF_OSF_TTL) ? info->ttl : 0;
|
||||
|
||||
list_for_each_entry_rcu(kf, &nf_osf_fingers[ctx.df], finger_entry) {
|
||||
|
||||
@ -257,7 +252,8 @@ nf_osf_match(const struct sk_buff *skb, u_int8_t family,
|
||||
EXPORT_SYMBOL_GPL(nf_osf_match);
|
||||
|
||||
const char *nf_osf_find(const struct sk_buff *skb,
|
||||
const struct list_head *nf_osf_fingers)
|
||||
const struct list_head *nf_osf_fingers,
|
||||
const int ttl_check)
|
||||
{
|
||||
const struct iphdr *ip = ip_hdr(skb);
|
||||
const struct nf_osf_user_finger *f;
|
||||
@ -275,7 +271,7 @@ const char *nf_osf_find(const struct sk_buff *skb,
|
||||
|
||||
list_for_each_entry_rcu(kf, &nf_osf_fingers[ctx.df], finger_entry) {
|
||||
f = &kf->finger;
|
||||
if (!nf_osf_match_one(skb, f, -1, &ctx))
|
||||
if (!nf_osf_match_one(skb, f, ttl_check, &ctx))
|
||||
continue;
|
||||
|
||||
genre = f->genre;
|
||||
|
@ -46,8 +46,6 @@ static int nft_dup_netdev_init(const struct nft_ctx *ctx,
|
||||
return nft_validate_register_load(priv->sreg_dev, sizeof(int));
|
||||
}
|
||||
|
||||
static const struct nft_expr_ops nft_dup_netdev_ingress_ops;
|
||||
|
||||
static int nft_dup_netdev_dump(struct sk_buff *skb, const struct nft_expr *expr)
|
||||
{
|
||||
struct nft_dup_netdev *priv = nft_expr_priv(expr);
|
||||
|
@ -201,7 +201,7 @@ static int flow_offload_netdev_event(struct notifier_block *this,
|
||||
if (event != NETDEV_DOWN)
|
||||
return NOTIFY_DONE;
|
||||
|
||||
nf_flow_table_cleanup(dev_net(dev), dev);
|
||||
nf_flow_table_cleanup(dev);
|
||||
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
@ -53,8 +53,6 @@ static int nft_fwd_netdev_init(const struct nft_ctx *ctx,
|
||||
return nft_validate_register_load(priv->sreg_dev, sizeof(int));
|
||||
}
|
||||
|
||||
static const struct nft_expr_ops nft_fwd_netdev_ingress_ops;
|
||||
|
||||
static int nft_fwd_netdev_dump(struct sk_buff *skb, const struct nft_expr *expr)
|
||||
{
|
||||
struct nft_fwd_netdev *priv = nft_expr_priv(expr);
|
||||
@ -169,8 +167,6 @@ static int nft_fwd_neigh_init(const struct nft_ctx *ctx,
|
||||
return nft_validate_register_load(priv->sreg_addr, addr_len);
|
||||
}
|
||||
|
||||
static const struct nft_expr_ops nft_fwd_netdev_ingress_ops;
|
||||
|
||||
static int nft_fwd_neigh_dump(struct sk_buff *skb, const struct nft_expr *expr)
|
||||
{
|
||||
struct nft_fwd_neigh *priv = nft_expr_priv(expr);
|
||||
|
@ -6,10 +6,12 @@
|
||||
|
||||
struct nft_osf {
|
||||
enum nft_registers dreg:8;
|
||||
u8 ttl;
|
||||
};
|
||||
|
||||
static const struct nla_policy nft_osf_policy[NFTA_OSF_MAX + 1] = {
|
||||
[NFTA_OSF_DREG] = { .type = NLA_U32 },
|
||||
[NFTA_OSF_TTL] = { .type = NLA_U8 },
|
||||
};
|
||||
|
||||
static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs,
|
||||
@ -33,7 +35,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs,
|
||||
return;
|
||||
}
|
||||
|
||||
os_name = nf_osf_find(skb, nf_osf_fingers);
|
||||
os_name = nf_osf_find(skb, nf_osf_fingers, priv->ttl);
|
||||
if (!os_name)
|
||||
strncpy((char *)dest, "unknown", NFT_OSF_MAXGENRELEN);
|
||||
else
|
||||
@ -46,6 +48,14 @@ static int nft_osf_init(const struct nft_ctx *ctx,
|
||||
{
|
||||
struct nft_osf *priv = nft_expr_priv(expr);
|
||||
int err;
|
||||
u8 ttl;
|
||||
|
||||
if (nla_get_u8(tb[NFTA_OSF_TTL])) {
|
||||
ttl = nla_get_u8(tb[NFTA_OSF_TTL]);
|
||||
if (ttl > 2)
|
||||
return -EINVAL;
|
||||
priv->ttl = ttl;
|
||||
}
|
||||
|
||||
priv->dreg = nft_parse_register(tb[NFTA_OSF_DREG]);
|
||||
err = nft_validate_register_store(ctx, priv->dreg, NULL,
|
||||
@ -60,6 +70,9 @@ static int nft_osf_dump(struct sk_buff *skb, const struct nft_expr *expr)
|
||||
{
|
||||
const struct nft_osf *priv = nft_expr_priv(expr);
|
||||
|
||||
if (nla_put_u8(skb, NFTA_OSF_TTL, priv->ttl))
|
||||
goto nla_put_failure;
|
||||
|
||||
if (nft_dump_register(skb, NFTA_OSF_DREG, priv->dreg))
|
||||
goto nla_put_failure;
|
||||
|
||||
|
@ -118,12 +118,13 @@ static bool xfrm_state_addr_ok(enum nft_xfrm_keys k, u8 family, u8 mode)
|
||||
|
||||
static void nft_xfrm_state_get_key(const struct nft_xfrm *priv,
|
||||
struct nft_regs *regs,
|
||||
const struct xfrm_state *state,
|
||||
u8 family)
|
||||
const struct xfrm_state *state)
|
||||
{
|
||||
u32 *dest = ®s->data[priv->dreg];
|
||||
|
||||
if (!xfrm_state_addr_ok(priv->key, family, state->props.mode)) {
|
||||
if (!xfrm_state_addr_ok(priv->key,
|
||||
state->props.family,
|
||||
state->props.mode)) {
|
||||
regs->verdict.code = NFT_BREAK;
|
||||
return;
|
||||
}
|
||||
@ -169,7 +170,7 @@ static void nft_xfrm_get_eval_in(const struct nft_xfrm *priv,
|
||||
}
|
||||
|
||||
state = sp->xvec[priv->spnum];
|
||||
nft_xfrm_state_get_key(priv, regs, state, nft_pf(pkt));
|
||||
nft_xfrm_state_get_key(priv, regs, state);
|
||||
}
|
||||
|
||||
static void nft_xfrm_get_eval_out(const struct nft_xfrm *priv,
|
||||
@ -184,7 +185,7 @@ static void nft_xfrm_get_eval_out(const struct nft_xfrm *priv,
|
||||
if (i < priv->spnum)
|
||||
continue;
|
||||
|
||||
nft_xfrm_state_get_key(priv, regs, dst->xfrm, nft_pf(pkt));
|
||||
nft_xfrm_state_get_key(priv, regs, dst->xfrm);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -40,14 +40,8 @@
|
||||
static bool
|
||||
xt_osf_match_packet(const struct sk_buff *skb, struct xt_action_param *p)
|
||||
{
|
||||
const struct xt_osf_info *info = p->matchinfo;
|
||||
struct net *net = xt_net(p);
|
||||
|
||||
if (!info)
|
||||
return false;
|
||||
|
||||
return nf_osf_match(skb, xt_family(p), xt_hooknum(p), xt_in(p),
|
||||
xt_out(p), info, net, nf_osf_fingers);
|
||||
xt_out(p), p->matchinfo, xt_net(p), nf_osf_fingers);
|
||||
}
|
||||
|
||||
static struct xt_match xt_osf_match = {
|
||||
|
@ -11,6 +11,11 @@
|
||||
#include <linux/netfilter/xt_quota.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
struct xt_quota_priv {
|
||||
spinlock_t lock;
|
||||
uint64_t quota;
|
||||
};
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Sam Johnston <samj@samj.net>");
|
||||
MODULE_DESCRIPTION("Xtables: countdown quota match");
|
||||
@ -21,48 +26,54 @@ static bool
|
||||
quota_mt(const struct sk_buff *skb, struct xt_action_param *par)
|
||||
{
|
||||
struct xt_quota_info *q = (void *)par->matchinfo;
|
||||
u64 current_count = atomic64_read(&q->counter);
|
||||
struct xt_quota_priv *priv = q->master;
|
||||
bool ret = q->flags & XT_QUOTA_INVERT;
|
||||
u64 old_count, new_count;
|
||||
|
||||
do {
|
||||
if (current_count == 1)
|
||||
return ret;
|
||||
if (current_count <= skb->len) {
|
||||
atomic64_set(&q->counter, 1);
|
||||
return ret;
|
||||
}
|
||||
old_count = current_count;
|
||||
new_count = current_count - skb->len;
|
||||
current_count = atomic64_cmpxchg(&q->counter, old_count,
|
||||
new_count);
|
||||
} while (current_count != old_count);
|
||||
return !ret;
|
||||
spin_lock_bh(&priv->lock);
|
||||
if (priv->quota >= skb->len) {
|
||||
priv->quota -= skb->len;
|
||||
ret = !ret;
|
||||
} else {
|
||||
/* we do not allow even small packets from now on */
|
||||
priv->quota = 0;
|
||||
}
|
||||
spin_unlock_bh(&priv->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int quota_mt_check(const struct xt_mtchk_param *par)
|
||||
{
|
||||
struct xt_quota_info *q = par->matchinfo;
|
||||
|
||||
BUILD_BUG_ON(sizeof(atomic64_t) != sizeof(__u64));
|
||||
|
||||
if (q->flags & ~XT_QUOTA_MASK)
|
||||
return -EINVAL;
|
||||
if (atomic64_read(&q->counter) > q->quota + 1)
|
||||
return -ERANGE;
|
||||
|
||||
if (atomic64_read(&q->counter) == 0)
|
||||
atomic64_set(&q->counter, q->quota + 1);
|
||||
q->master = kmalloc(sizeof(*q->master), GFP_KERNEL);
|
||||
if (q->master == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
spin_lock_init(&q->master->lock);
|
||||
q->master->quota = q->quota;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void quota_mt_destroy(const struct xt_mtdtor_param *par)
|
||||
{
|
||||
const struct xt_quota_info *q = par->matchinfo;
|
||||
|
||||
kfree(q->master);
|
||||
}
|
||||
|
||||
static struct xt_match quota_mt_reg __read_mostly = {
|
||||
.name = "quota",
|
||||
.revision = 0,
|
||||
.family = NFPROTO_UNSPEC,
|
||||
.match = quota_mt,
|
||||
.checkentry = quota_mt_check,
|
||||
.destroy = quota_mt_destroy,
|
||||
.matchsize = sizeof(struct xt_quota_info),
|
||||
.usersize = offsetof(struct xt_quota_info, master),
|
||||
.me = THIS_MODULE,
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user