mirror of
https://github.com/torvalds/linux.git
synced 2026-09-11 20:13:02 +02:00
netfilter pull request 26-09-07
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEjF9xRqF1emXiQiqU1w0aZmrPKyEFAmqe60oACgkQ1w0aZmrP
KyF4xw//THfqJRAWHoVGyQcfRQs1/FdmE5XcdN8pDdS55XvYljDx+A8UyJlMoBaq
tXr76jA74nngwkwkh8dmaCfGurHe1GtVkqE38AMfOEUbuImqvznFG9fp1mb3u3Kz
jmoeOhxjZGXzBw9ng1xs+Ip0opU8GgulVdGSD0NzzHFRGdj29MA/q5Y1Eo2KqYQ/
NlKgivExotll20YirWgOMHrAt5uGqtJLWcZWCj3G1ASdlzNHcM2HF+1vW4TvMFEy
jKSfN8u+YdI+k+5TLQtPFvodMqWgsZhZ6llqbxUav7uO/NkZLha0wJf9Lwky9s+F
4/iRsnXos9imEa4pm8tkVg12xl9P3rLMrFYqfrIoNL94nUDgXyLZ+44qBBROWnaN
97KJ4fok7Ny38cIqz4CbwEWncB71obBokmBhY+byoyhwAmMkxBnfj6C5emU4NXvp
6EiB0xh4PXBYaCfZO4JnDPXHNNFkSi+MGBhpKlV0K2ZRNAKB4jYuWw3jSGdwTNIA
bxKsH/j3nYvpNCDBeEhxQyokNJ9yWxhNRz41Ejym4BKN0PndkQlU8dmhS+kDWiyD
Gswqmi6WJhflxxI6mq3FROl10vmZnSQfJk4nKhT4TYxmyvB8HbA5FWV7Gd+77yxg
i7zmLrE3TzKu3cbSuM+o5Qei9tcTDCdMa8HH3dZbPbQlFvocGVc=
=BBrp
-----END PGP SIGNATURE-----
Merge tag 'nf-26-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains Netfilter/IPVS fixes for net:
1) Reject malformed messages in IPVS sync, from Kyle Zeng.
2) Fix possible stale infoleak in IPVS sync, also from Kyle Zeng.
3) Out-of-bound read in the SIP conntrack helper, from
Joas Antonio dos Santos.
4) UaF on cttimeout module removal, from Chengfeng Ye.
5) Unregister nf_loggers before netns teardown to fix UaF,
also from Chengfeng Ye.
6) Fix race in nfnetlink_log due to concurrent instance destruction,
from Florian Westphal.
7) Remove arp_table 32bit compat interface, this is already off in
many distributions, from Florian Westphal.
8) Set IP6T_F_PROTO flag is e->ipv6.proto is set on to deal with
insufficient validation of xtables extensions when used from
legacy ip6tables, from Florian.
9) Set on the NLM_F_DUMP_FILTERED flag when all is filtering out
in ctnetlink, from Ilya Maximets.
* tag 'nf-26-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
netfilter: report NLM_F_DUMP_FILTERED when all is filtered out
netfilter: ip6_tables: set F_PROTO when proto value is nonzero
netfilter: arp_tables: remove the 32bit compat interface
netfilter: nfnetlink_log: cope with concurrent instance destruction
netfilter: nf_log: unregister loggers before per-net teardown
netfilter: cttimeout: prevent UAF during module unload
netfilter: nf_conntrack_sip: fix OOB read in sip_skip_whitespace()
ipvs: fix reversed sequence option serialization
ipvs: reject invalid states in connection template sync records
====================
Link: https://patch.msgid.link/20260907171732.1407739-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
commit
1b8e56030d
|
|
@ -56,23 +56,4 @@ void arpt_unregister_table(struct net *net, const char *name);
|
|||
extern unsigned int arpt_do_table(void *priv, struct sk_buff *skb,
|
||||
const struct nf_hook_state *state);
|
||||
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
#include <net/compat.h>
|
||||
|
||||
struct compat_arpt_entry {
|
||||
struct arpt_arp arp;
|
||||
__u16 target_offset;
|
||||
__u16 next_offset;
|
||||
compat_uint_t comefrom;
|
||||
struct compat_xt_counters counters;
|
||||
unsigned char elems[];
|
||||
};
|
||||
|
||||
static inline struct xt_entry_target *
|
||||
compat_arpt_get_target(struct compat_arpt_entry *e)
|
||||
{
|
||||
return (void *)e + e->target_offset;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_COMPAT */
|
||||
#endif /* _ARPTABLES_H */
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/err.h>
|
||||
#include <net/compat.h>
|
||||
#include <net/sock.h>
|
||||
#include <linux/uaccess.h>
|
||||
|
||||
|
|
@ -724,80 +723,6 @@ static int copy_entries_to_user(unsigned int total_size,
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
static void compat_standard_from_user(void *dst, const void *src)
|
||||
{
|
||||
int v = *(compat_int_t *)src;
|
||||
|
||||
if (v > 0)
|
||||
v += xt_compat_calc_jump(NFPROTO_ARP, v);
|
||||
memcpy(dst, &v, sizeof(v));
|
||||
}
|
||||
|
||||
static int compat_standard_to_user(void __user *dst, const void *src)
|
||||
{
|
||||
compat_int_t cv = *(int *)src;
|
||||
|
||||
if (cv > 0)
|
||||
cv -= xt_compat_calc_jump(NFPROTO_ARP, cv);
|
||||
return copy_to_user(dst, &cv, sizeof(cv)) ? -EFAULT : 0;
|
||||
}
|
||||
|
||||
static int compat_calc_entry(const struct arpt_entry *e,
|
||||
const struct xt_table_info *info,
|
||||
const void *base, struct xt_table_info *newinfo)
|
||||
{
|
||||
const struct xt_entry_target *t;
|
||||
unsigned int entry_offset;
|
||||
int off, i, ret;
|
||||
|
||||
off = sizeof(struct arpt_entry) - sizeof(struct compat_arpt_entry);
|
||||
entry_offset = (void *)e - base;
|
||||
|
||||
t = arpt_get_target_c(e);
|
||||
off += xt_compat_target_offset(t->u.kernel.target);
|
||||
newinfo->size -= off;
|
||||
ret = xt_compat_add_offset(NFPROTO_ARP, entry_offset, off);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
|
||||
if (info->hook_entry[i] &&
|
||||
(e < (struct arpt_entry *)(base + info->hook_entry[i])))
|
||||
newinfo->hook_entry[i] -= off;
|
||||
if (info->underflow[i] &&
|
||||
(e < (struct arpt_entry *)(base + info->underflow[i])))
|
||||
newinfo->underflow[i] -= off;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int compat_table_info(const struct xt_table_info *info,
|
||||
struct xt_table_info *newinfo)
|
||||
{
|
||||
struct arpt_entry *iter;
|
||||
const void *loc_cpu_entry;
|
||||
int ret;
|
||||
|
||||
if (!newinfo || !info)
|
||||
return -EINVAL;
|
||||
|
||||
/* we dont care about newinfo->entries */
|
||||
memcpy(newinfo, info, offsetof(struct xt_table_info, entries));
|
||||
newinfo->initial_entries = 0;
|
||||
loc_cpu_entry = info->entries;
|
||||
ret = xt_compat_init_offsets(NFPROTO_ARP, info->number);
|
||||
if (ret)
|
||||
return ret;
|
||||
xt_entry_foreach(iter, loc_cpu_entry, info->size) {
|
||||
ret = compat_calc_entry(iter, info, loc_cpu_entry, newinfo);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int get_info(struct net *net, void __user *user, const int *len)
|
||||
{
|
||||
char name[XT_TABLE_MAXNAMELEN];
|
||||
|
|
@ -811,23 +736,11 @@ static int get_info(struct net *net, void __user *user, const int *len)
|
|||
return -EFAULT;
|
||||
|
||||
name[XT_TABLE_MAXNAMELEN-1] = '\0';
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
if (in_compat_syscall())
|
||||
xt_compat_lock(NFPROTO_ARP);
|
||||
#endif
|
||||
t = xt_request_find_table_lock(net, NFPROTO_ARP, name);
|
||||
if (!IS_ERR(t)) {
|
||||
struct arpt_getinfo info;
|
||||
const struct xt_table_info *private = t->private;
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
struct xt_table_info tmp;
|
||||
|
||||
if (in_compat_syscall()) {
|
||||
ret = compat_table_info(private, &tmp);
|
||||
xt_compat_flush_offsets(NFPROTO_ARP);
|
||||
private = &tmp;
|
||||
}
|
||||
#endif
|
||||
memset(&info, 0, sizeof(info));
|
||||
info.valid_hooks = t->valid_hooks;
|
||||
memcpy(info.hook_entry, private->hook_entry,
|
||||
|
|
@ -846,10 +759,7 @@ static int get_info(struct net *net, void __user *user, const int *len)
|
|||
module_put(t->me);
|
||||
} else
|
||||
ret = PTR_ERR(t);
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
if (in_compat_syscall())
|
||||
xt_compat_unlock(NFPROTO_ARP);
|
||||
#endif
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1059,367 +969,6 @@ static int do_add_counters(struct net *net, sockptr_t arg, unsigned int len)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
struct compat_arpt_replace {
|
||||
char name[XT_TABLE_MAXNAMELEN];
|
||||
u32 valid_hooks;
|
||||
u32 num_entries;
|
||||
u32 size;
|
||||
u32 hook_entry[NF_ARP_NUMHOOKS];
|
||||
u32 underflow[NF_ARP_NUMHOOKS];
|
||||
u32 num_counters;
|
||||
compat_uptr_t counters;
|
||||
struct compat_arpt_entry entries[];
|
||||
};
|
||||
|
||||
static inline void compat_release_entry(struct compat_arpt_entry *e)
|
||||
{
|
||||
struct xt_entry_target *t;
|
||||
|
||||
t = compat_arpt_get_target(e);
|
||||
module_put(t->u.kernel.target->me);
|
||||
}
|
||||
|
||||
static int
|
||||
check_compat_entry_size_and_hooks(struct compat_arpt_entry *e,
|
||||
struct xt_table_info *newinfo,
|
||||
unsigned int *size,
|
||||
const unsigned char *base,
|
||||
const unsigned char *limit)
|
||||
{
|
||||
struct xt_entry_target *t;
|
||||
struct xt_target *target;
|
||||
unsigned int entry_offset;
|
||||
int ret, off;
|
||||
|
||||
if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0 ||
|
||||
(unsigned char *)e + sizeof(struct compat_arpt_entry) >= limit ||
|
||||
(unsigned char *)e + e->next_offset > limit)
|
||||
return -EINVAL;
|
||||
|
||||
if (e->next_offset < sizeof(struct compat_arpt_entry) +
|
||||
sizeof(struct compat_xt_entry_target))
|
||||
return -EINVAL;
|
||||
|
||||
if (!arp_checkentry(&e->arp))
|
||||
return -EINVAL;
|
||||
|
||||
ret = xt_compat_check_entry_offsets(e, e->elems, e->target_offset,
|
||||
e->next_offset);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
off = sizeof(struct arpt_entry) - sizeof(struct compat_arpt_entry);
|
||||
entry_offset = (void *)e - (void *)base;
|
||||
|
||||
t = compat_arpt_get_target(e);
|
||||
target = xt_request_find_target(NFPROTO_ARP, t->u.user.name,
|
||||
t->u.user.revision);
|
||||
if (IS_ERR(target)) {
|
||||
ret = PTR_ERR(target);
|
||||
goto out;
|
||||
}
|
||||
t->u.kernel.target = target;
|
||||
|
||||
off += xt_compat_target_offset(target);
|
||||
*size += off;
|
||||
ret = xt_compat_add_offset(NFPROTO_ARP, entry_offset, off);
|
||||
if (ret)
|
||||
goto release_target;
|
||||
|
||||
return 0;
|
||||
|
||||
release_target:
|
||||
module_put(t->u.kernel.target->me);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
||||
unsigned int *size,
|
||||
struct xt_table_info *newinfo, unsigned char *base)
|
||||
{
|
||||
struct xt_entry_target *t;
|
||||
struct arpt_entry *de;
|
||||
unsigned int origsize;
|
||||
int h;
|
||||
|
||||
origsize = *size;
|
||||
de = *dstptr;
|
||||
memcpy(de, e, sizeof(struct arpt_entry));
|
||||
memcpy(&de->counters, &e->counters, sizeof(e->counters));
|
||||
|
||||
*dstptr += sizeof(struct arpt_entry);
|
||||
*size += sizeof(struct arpt_entry) - sizeof(struct compat_arpt_entry);
|
||||
|
||||
de->target_offset = e->target_offset - (origsize - *size);
|
||||
t = compat_arpt_get_target(e);
|
||||
xt_compat_target_from_user(t, dstptr, size);
|
||||
|
||||
de->next_offset = e->next_offset - (origsize - *size);
|
||||
for (h = 0; h < NF_ARP_NUMHOOKS; h++) {
|
||||
if ((unsigned char *)de - base < newinfo->hook_entry[h])
|
||||
newinfo->hook_entry[h] -= origsize - *size;
|
||||
if ((unsigned char *)de - base < newinfo->underflow[h])
|
||||
newinfo->underflow[h] -= origsize - *size;
|
||||
}
|
||||
}
|
||||
|
||||
static int translate_compat_table(struct net *net,
|
||||
struct xt_table_info **pinfo,
|
||||
void **pentry0,
|
||||
const struct compat_arpt_replace *compatr)
|
||||
{
|
||||
unsigned int i, j;
|
||||
struct xt_table_info *newinfo, *info;
|
||||
void *pos, *entry0, *entry1;
|
||||
struct compat_arpt_entry *iter0;
|
||||
struct arpt_replace repl;
|
||||
unsigned int size;
|
||||
int ret;
|
||||
|
||||
info = *pinfo;
|
||||
entry0 = *pentry0;
|
||||
size = compatr->size;
|
||||
info->number = compatr->num_entries;
|
||||
|
||||
j = 0;
|
||||
xt_compat_lock(NFPROTO_ARP);
|
||||
ret = xt_compat_init_offsets(NFPROTO_ARP, compatr->num_entries);
|
||||
if (ret)
|
||||
goto out_unlock;
|
||||
/* Walk through entries, checking offsets. */
|
||||
xt_entry_foreach(iter0, entry0, compatr->size) {
|
||||
ret = check_compat_entry_size_and_hooks(iter0, info, &size,
|
||||
entry0,
|
||||
entry0 + compatr->size);
|
||||
if (ret != 0)
|
||||
goto out_unlock;
|
||||
++j;
|
||||
}
|
||||
|
||||
ret = -EINVAL;
|
||||
if (j != compatr->num_entries)
|
||||
goto out_unlock;
|
||||
|
||||
ret = -ENOMEM;
|
||||
newinfo = xt_alloc_table_info(size);
|
||||
if (!newinfo)
|
||||
goto out_unlock;
|
||||
|
||||
memset(newinfo->entries, 0, size);
|
||||
|
||||
newinfo->number = compatr->num_entries;
|
||||
for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
|
||||
newinfo->hook_entry[i] = compatr->hook_entry[i];
|
||||
newinfo->underflow[i] = compatr->underflow[i];
|
||||
}
|
||||
entry1 = newinfo->entries;
|
||||
pos = entry1;
|
||||
size = compatr->size;
|
||||
xt_entry_foreach(iter0, entry0, compatr->size)
|
||||
compat_copy_entry_from_user(iter0, &pos, &size,
|
||||
newinfo, entry1);
|
||||
|
||||
/* all module references in entry0 are now gone */
|
||||
|
||||
xt_compat_flush_offsets(NFPROTO_ARP);
|
||||
xt_compat_unlock(NFPROTO_ARP);
|
||||
|
||||
memcpy(&repl, compatr, sizeof(*compatr));
|
||||
|
||||
for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
|
||||
repl.hook_entry[i] = newinfo->hook_entry[i];
|
||||
repl.underflow[i] = newinfo->underflow[i];
|
||||
}
|
||||
|
||||
repl.num_counters = 0;
|
||||
repl.counters = NULL;
|
||||
repl.size = newinfo->size;
|
||||
ret = translate_table(net, newinfo, entry1, &repl);
|
||||
if (ret)
|
||||
goto free_newinfo;
|
||||
|
||||
*pinfo = newinfo;
|
||||
*pentry0 = entry1;
|
||||
xt_free_table_info(info);
|
||||
return 0;
|
||||
|
||||
free_newinfo:
|
||||
xt_free_table_info(newinfo);
|
||||
return ret;
|
||||
out_unlock:
|
||||
xt_compat_flush_offsets(NFPROTO_ARP);
|
||||
xt_compat_unlock(NFPROTO_ARP);
|
||||
xt_entry_foreach(iter0, entry0, compatr->size) {
|
||||
if (j-- == 0)
|
||||
break;
|
||||
compat_release_entry(iter0);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int compat_do_replace(struct net *net, sockptr_t arg, unsigned int len)
|
||||
{
|
||||
int ret;
|
||||
struct compat_arpt_replace tmp;
|
||||
struct xt_table_info *newinfo;
|
||||
void *loc_cpu_entry;
|
||||
struct arpt_entry *iter;
|
||||
|
||||
if (len < sizeof(tmp))
|
||||
return -EINVAL;
|
||||
if (copy_from_sockptr(&tmp, arg, sizeof(tmp)) != 0)
|
||||
return -EFAULT;
|
||||
|
||||
/* overflow check */
|
||||
if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
|
||||
return -ENOMEM;
|
||||
if (tmp.num_counters == 0)
|
||||
return -EINVAL;
|
||||
if ((u64)len < (u64)tmp.size + sizeof(tmp))
|
||||
return -EINVAL;
|
||||
|
||||
tmp.name[sizeof(tmp.name)-1] = 0;
|
||||
|
||||
newinfo = xt_alloc_table_info(tmp.size);
|
||||
if (!newinfo)
|
||||
return -ENOMEM;
|
||||
|
||||
loc_cpu_entry = newinfo->entries;
|
||||
if (copy_from_sockptr_offset(loc_cpu_entry, arg, sizeof(tmp),
|
||||
tmp.size) != 0) {
|
||||
ret = -EFAULT;
|
||||
goto free_newinfo;
|
||||
}
|
||||
|
||||
ret = translate_compat_table(net, &newinfo, &loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
ret = __do_replace(net, tmp.name, tmp.valid_hooks, newinfo,
|
||||
tmp.num_counters, compat_ptr(tmp.counters));
|
||||
if (ret)
|
||||
goto free_newinfo_untrans;
|
||||
return 0;
|
||||
|
||||
free_newinfo_untrans:
|
||||
xt_entry_foreach(iter, loc_cpu_entry, newinfo->size)
|
||||
cleanup_entry(iter, net);
|
||||
free_newinfo:
|
||||
xt_free_table_info(newinfo);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int compat_copy_entry_to_user(struct arpt_entry *e, void __user **dstptr,
|
||||
compat_uint_t *size,
|
||||
struct xt_counters *counters,
|
||||
unsigned int i)
|
||||
{
|
||||
struct xt_entry_target *t;
|
||||
struct compat_arpt_entry __user *ce;
|
||||
u_int16_t target_offset, next_offset;
|
||||
compat_uint_t origsize;
|
||||
int ret;
|
||||
|
||||
origsize = *size;
|
||||
ce = *dstptr;
|
||||
if (copy_to_user(ce, e, offsetof(struct compat_arpt_entry, counters)) ||
|
||||
copy_to_user(&ce->counters, &counters[i], sizeof(counters[i])))
|
||||
return -EFAULT;
|
||||
|
||||
*dstptr += sizeof(struct compat_arpt_entry);
|
||||
*size -= sizeof(struct arpt_entry) - sizeof(struct compat_arpt_entry);
|
||||
|
||||
target_offset = e->target_offset - (origsize - *size);
|
||||
|
||||
t = arpt_get_target(e);
|
||||
ret = xt_compat_target_to_user(t, dstptr, size);
|
||||
if (ret)
|
||||
return ret;
|
||||
next_offset = e->next_offset - (origsize - *size);
|
||||
if (put_user(target_offset, &ce->target_offset) != 0 ||
|
||||
put_user(next_offset, &ce->next_offset) != 0)
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int compat_copy_entries_to_user(unsigned int total_size,
|
||||
struct xt_table *table,
|
||||
void __user *userptr)
|
||||
{
|
||||
struct xt_counters *counters;
|
||||
const struct xt_table_info *private = table->private;
|
||||
void __user *pos;
|
||||
unsigned int size;
|
||||
int ret = 0;
|
||||
unsigned int i = 0;
|
||||
struct arpt_entry *iter;
|
||||
|
||||
counters = alloc_counters(table);
|
||||
if (IS_ERR(counters))
|
||||
return PTR_ERR(counters);
|
||||
|
||||
pos = userptr;
|
||||
size = total_size;
|
||||
xt_entry_foreach(iter, private->entries, total_size) {
|
||||
ret = compat_copy_entry_to_user(iter, &pos,
|
||||
&size, counters, i++);
|
||||
if (ret != 0)
|
||||
break;
|
||||
}
|
||||
vfree(counters);
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct compat_arpt_get_entries {
|
||||
char name[XT_TABLE_MAXNAMELEN];
|
||||
compat_uint_t size;
|
||||
struct compat_arpt_entry entrytable[];
|
||||
};
|
||||
|
||||
static int compat_get_entries(struct net *net,
|
||||
struct compat_arpt_get_entries __user *uptr,
|
||||
int *len)
|
||||
{
|
||||
int ret;
|
||||
struct compat_arpt_get_entries get;
|
||||
struct xt_table *t;
|
||||
|
||||
if (*len < sizeof(get))
|
||||
return -EINVAL;
|
||||
if (copy_from_user(&get, uptr, sizeof(get)) != 0)
|
||||
return -EFAULT;
|
||||
if (*len != sizeof(struct compat_arpt_get_entries) + get.size)
|
||||
return -EINVAL;
|
||||
|
||||
get.name[sizeof(get.name) - 1] = '\0';
|
||||
|
||||
xt_compat_lock(NFPROTO_ARP);
|
||||
t = xt_find_table_lock(net, NFPROTO_ARP, get.name);
|
||||
if (!IS_ERR(t)) {
|
||||
const struct xt_table_info *private = t->private;
|
||||
struct xt_table_info info;
|
||||
|
||||
ret = compat_table_info(private, &info);
|
||||
if (!ret && get.size == info.size) {
|
||||
ret = compat_copy_entries_to_user(private->size,
|
||||
t, uptr->entrytable);
|
||||
} else if (!ret)
|
||||
ret = -EAGAIN;
|
||||
|
||||
xt_compat_flush_offsets(NFPROTO_ARP);
|
||||
module_put(t->me);
|
||||
xt_table_unlock(t);
|
||||
} else
|
||||
ret = PTR_ERR(t);
|
||||
|
||||
xt_compat_unlock(NFPROTO_ARP);
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int do_arpt_set_ctl(struct sock *sk, int cmd, sockptr_t arg,
|
||||
unsigned int len)
|
||||
{
|
||||
|
|
@ -1432,12 +981,7 @@ static int do_arpt_set_ctl(struct sock *sk, int cmd, sockptr_t arg,
|
|||
|
||||
switch (cmd) {
|
||||
case ARPT_SO_SET_REPLACE:
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
if (in_compat_syscall())
|
||||
ret = compat_do_replace(sock_net(sk), arg, len);
|
||||
else
|
||||
#endif
|
||||
ret = do_replace(sock_net(sk), arg, len);
|
||||
ret = do_replace(sock_net(sk), arg, len);
|
||||
break;
|
||||
|
||||
case ARPT_SO_SET_ADD_COUNTERS:
|
||||
|
|
@ -1466,12 +1010,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
|
|||
break;
|
||||
|
||||
case ARPT_SO_GET_ENTRIES:
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
if (in_compat_syscall())
|
||||
ret = compat_get_entries(sock_net(sk), user, len);
|
||||
else
|
||||
#endif
|
||||
ret = get_entries(sock_net(sk), user, len);
|
||||
ret = get_entries(sock_net(sk), user, len);
|
||||
break;
|
||||
|
||||
case ARPT_SO_GET_REVISION_TARGET: {
|
||||
|
|
@ -1568,11 +1107,6 @@ static struct xt_target arpt_builtin_tg[] __read_mostly = {
|
|||
.name = XT_STANDARD_TARGET,
|
||||
.targetsize = sizeof(int),
|
||||
.family = NFPROTO_ARP,
|
||||
#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
|
||||
.compatsize = sizeof(compat_int_t),
|
||||
.compat_from_user = compat_standard_from_user,
|
||||
.compat_to_user = compat_standard_to_user,
|
||||
#endif
|
||||
},
|
||||
{
|
||||
.name = XT_ERROR_TARGET,
|
||||
|
|
|
|||
|
|
@ -647,6 +647,11 @@ check_entry_size_and_hooks(struct ip6t_entry *e,
|
|||
/* Clear counters and comefrom */
|
||||
e->counters = ((struct xt_counters) { 0, 0 });
|
||||
e->comefrom = 0;
|
||||
|
||||
/* set F_PROTO, else ip6_packet_match won't do the right thing. */
|
||||
if (e->ipv6.proto)
|
||||
e->ipv6.flags |= IP6T_F_PROTO;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -739,7 +739,7 @@ config NETFILTER_XTABLES_COMPAT
|
|||
bool "Netfilter Xtables 32bit support"
|
||||
depends on COMPAT
|
||||
help
|
||||
This option provides a translation layer to run 32bit arp,ip(6),ebtables
|
||||
This option provides a translation layer to run 32bit ip(6),ebtables
|
||||
binaries on 64bit kernels.
|
||||
|
||||
If unsure, say N.
|
||||
|
|
|
|||
|
|
@ -747,9 +747,9 @@ void ip_vs_sync_conn(struct netns_ipvs *ipvs, struct ip_vs_conn *cp, int pkts)
|
|||
if (cp->flags & IP_VS_CONN_F_SEQ_MASK) {
|
||||
*(p++) = IPVS_OPT_SEQ_DATA;
|
||||
*(p++) = sizeof(struct ip_vs_sync_conn_options);
|
||||
hton_seq((struct ip_vs_seq *)p, &cp->in_seq);
|
||||
hton_seq(&cp->in_seq, (struct ip_vs_seq *)p);
|
||||
p += sizeof(struct ip_vs_seq);
|
||||
hton_seq((struct ip_vs_seq *)p, &cp->out_seq);
|
||||
hton_seq(&cp->out_seq, (struct ip_vs_seq *)p);
|
||||
p += sizeof(struct ip_vs_seq);
|
||||
}
|
||||
/* Handle pe data */
|
||||
|
|
@ -999,10 +999,10 @@ static void ip_vs_process_message_v0(struct netns_ipvs *ipvs, const char *buffer
|
|||
pp->name, state);
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
if (state >= IP_VS_CTPL_S_LAST)
|
||||
IP_VS_DBG(7, "BACKUP v0, Invalid tpl state %u\n",
|
||||
state);
|
||||
} else if (state >= IP_VS_CTPL_S_LAST) {
|
||||
IP_VS_DBG(7, "BACKUP v0, Invalid tpl state %u\n",
|
||||
state);
|
||||
continue;
|
||||
}
|
||||
|
||||
ip_vs_conn_fill_param(ipvs, AF_INET, s->protocol,
|
||||
|
|
@ -1159,10 +1159,10 @@ static inline int ip_vs_proc_sync_conn(struct netns_ipvs *ipvs, __u8 *p, __u8 *m
|
|||
retc = 40;
|
||||
goto out;
|
||||
}
|
||||
} else {
|
||||
if (state >= IP_VS_CTPL_S_LAST)
|
||||
IP_VS_DBG(7, "BACKUP, Invalid tpl state %u\n",
|
||||
state);
|
||||
} else if (state >= IP_VS_CTPL_S_LAST) {
|
||||
IP_VS_DBG(7, "BACKUP, Invalid tpl state %u\n", state);
|
||||
retc = 40;
|
||||
goto out;
|
||||
}
|
||||
if (ip_vs_conn_fill_param_sync(ipvs, af, s, ¶m, pe_data,
|
||||
pe_data_len, pe_name, pe_name_len)) {
|
||||
|
|
|
|||
|
|
@ -1077,6 +1077,8 @@ static int ctnetlink_start(struct netlink_callback *cb)
|
|||
}
|
||||
|
||||
cb->data = filter;
|
||||
if (filter)
|
||||
cb->answer_flags = NLM_F_DUMP_FILTERED;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@ static const char *sip_skip_whitespace(const char *dptr, const char *limit)
|
|||
dptr = sip_follow_continuation(dptr, limit);
|
||||
break;
|
||||
}
|
||||
return dptr;
|
||||
return dptr < limit ? dptr : NULL;
|
||||
}
|
||||
|
||||
/* Search within a SIP header value, dealing with continuation lines */
|
||||
|
|
|
|||
|
|
@ -1073,12 +1073,12 @@ static int __init nf_log_syslog_init(void)
|
|||
|
||||
static void __exit nf_log_syslog_exit(void)
|
||||
{
|
||||
unregister_pernet_subsys(&nf_log_syslog_net_ops);
|
||||
nf_log_unregister(&nf_ip_logger);
|
||||
nf_log_unregister(&nf_arp_logger);
|
||||
nf_log_unregister(&nf_ip6_logger);
|
||||
nf_log_unregister(&nf_netdev_logger);
|
||||
nf_log_unregister(&nf_bridge_logger);
|
||||
unregister_pernet_subsys(&nf_log_syslog_net_ops);
|
||||
}
|
||||
|
||||
module_init(nf_log_syslog_init);
|
||||
|
|
|
|||
|
|
@ -652,9 +652,9 @@ static void __exit cttimeout_exit(void)
|
|||
{
|
||||
nfnetlink_subsys_unregister(&cttimeout_subsys);
|
||||
|
||||
unregister_pernet_subsys(&cttimeout_ops);
|
||||
RCU_INIT_POINTER(nf_ct_timeout_hook, NULL);
|
||||
synchronize_net();
|
||||
unregister_pernet_subsys(&cttimeout_ops);
|
||||
}
|
||||
|
||||
module_init(cttimeout_init);
|
||||
|
|
|
|||
|
|
@ -228,13 +228,18 @@ static void __nfulnl_flush(struct nfulnl_instance *inst);
|
|||
static void
|
||||
__instance_destroy(struct nfulnl_instance *inst)
|
||||
{
|
||||
spin_lock(&inst->lock);
|
||||
if (inst->copy_mode == NFULNL_COPY_DISABLED) {
|
||||
/* attempt to UNBIND a queue already pending
|
||||
* destruction via netlink close event. Ignore.
|
||||
*/
|
||||
spin_unlock(&inst->lock);
|
||||
return;
|
||||
}
|
||||
|
||||
/* first pull it out of the global list */
|
||||
hlist_del_rcu(&inst->hlist);
|
||||
|
||||
/* then flush all pending packets from skb */
|
||||
|
||||
spin_lock(&inst->lock);
|
||||
|
||||
/* lockless readers wont be able to use us */
|
||||
inst->copy_mode = NFULNL_COPY_DISABLED;
|
||||
|
||||
|
|
@ -1233,8 +1238,8 @@ static void __exit nfnetlink_log_fini(void)
|
|||
{
|
||||
nfnetlink_subsys_unregister(&nfulnl_subsys);
|
||||
netlink_unregister_notifier(&nfulnl_rtnl_notifier);
|
||||
unregister_pernet_subsys(&nfnl_log_net_ops);
|
||||
nf_log_unregister(&nfulnl_logger);
|
||||
unregister_pernet_subsys(&nfnl_log_net_ops);
|
||||
}
|
||||
|
||||
MODULE_DESCRIPTION("netfilter userspace logging");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user