From 6cdb9e61b36ed5f1b737e403b9d95ae1820b5d54 Mon Sep 17 00:00:00 2001 From: Steve French Date: Mon, 24 Apr 2006 16:24:54 +0000 Subject: [PATCH] --- yaml --- r: 26174 b: refs/heads/master c: 301dc3e6f6ea83703fa52919c00e60661da5a8fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/connect.c | 5 ++++- trunk/include/asm-sparc/unistd.h | 2 +- trunk/include/asm-sparc64/unistd.h | 2 +- trunk/include/linux/netfilter/x_tables.h | 4 ---- trunk/net/ipv4/netfilter/Kconfig | 2 +- trunk/net/ipv6/netfilter/ip6_tables.c | 13 +++++++++++++ trunk/net/netfilter/nf_conntrack_core.c | 15 +++++++++++---- .../net/netfilter/nf_conntrack_l3proto_generic.c | 1 + trunk/net/netfilter/x_tables.c | 2 +- trunk/net/sched/act_ipt.c | 5 ----- 11 files changed, 34 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 9e7ea29d5eac..d6bef90df4ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18118cdbfd1f855e09ee511d764d6c9df3d4f952 +refs/heads/master: 301dc3e6f6ea83703fa52919c00e60661da5a8fe diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index aaf151cb5822..d2ec806a4f32 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, pSesInfo->server->secMode, pSesInfo->server->capabilities, pSesInfo->server->timeZone)); +#ifdef CONFIG_CIFS_EXPERIMENTAL if(experimEnabled > 1) rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */, &ntlmv2_flag, nls_info); - else if (extended_security + else +#endif + if (extended_security && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) && (pSesInfo->server->secType == NTLMSSP)) { cFYI(1, ("New style sesssetup")); diff --git a/trunk/include/asm-sparc/unistd.h b/trunk/include/asm-sparc/unistd.h index 32a48f623e2b..45feff893b8e 100644 --- a/trunk/include/asm-sparc/unistd.h +++ b/trunk/include/asm-sparc/unistd.h @@ -271,7 +271,7 @@ #define __NR_getsid 252 #define __NR_fdatasync 253 #define __NR_nfsservctl 254 -#define __NR_sync_file_range 255 +#define __NR_sys_sync_file_range 255 #define __NR_clock_settime 256 #define __NR_clock_gettime 257 #define __NR_clock_getres 258 diff --git a/trunk/include/asm-sparc64/unistd.h b/trunk/include/asm-sparc64/unistd.h index ca80e8aca128..597f6923a46e 100644 --- a/trunk/include/asm-sparc64/unistd.h +++ b/trunk/include/asm-sparc64/unistd.h @@ -273,7 +273,7 @@ #define __NR_getsid 252 #define __NR_fdatasync 253 #define __NR_nfsservctl 254 -#define __NR_sync_file_range 255 +#define __NR_sys_sync_file_range 255 #define __NR_clock_settime 256 #define __NR_clock_gettime 257 #define __NR_clock_getres 258 diff --git a/trunk/include/linux/netfilter/x_tables.h b/trunk/include/linux/netfilter/x_tables.h index 38701454e197..f6bdef82a322 100644 --- a/trunk/include/linux/netfilter/x_tables.h +++ b/trunk/include/linux/netfilter/x_tables.h @@ -361,11 +361,7 @@ struct compat_xt_entry_target struct compat_xt_counters { -#if defined(CONFIG_X86_64) || defined(CONFIG_IA64) u_int32_t cnt[4]; -#else - u_int64_t cnt[2]; -#endif }; struct compat_xt_counters_info diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig index 3d560dec63ab..c60fd5c4ea1e 100644 --- a/trunk/net/ipv4/netfilter/Kconfig +++ b/trunk/net/ipv4/netfilter/Kconfig @@ -345,7 +345,7 @@ config IP_NF_TARGET_LOG To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_ULOG - tristate "ULOG target support" + tristate "ULOG target support (OBSOLETE)" depends on IP_NF_IPTABLES ---help--- diff --git a/trunk/net/ipv6/netfilter/ip6_tables.c b/trunk/net/ipv6/netfilter/ip6_tables.c index 0a673038344f..642b4b11464f 100644 --- a/trunk/net/ipv6/netfilter/ip6_tables.c +++ b/trunk/net/ipv6/netfilter/ip6_tables.c @@ -288,6 +288,19 @@ ip6t_do_table(struct sk_buff **pskb, table_base = (void *)private->entries[smp_processor_id()]; e = get_entry(table_base, private->hook_entry[hook]); +#ifdef CONFIG_NETFILTER_DEBUG + /* Check noone else using our table */ + if (((struct ip6t_entry *)table_base)->comefrom != 0xdead57ac + && ((struct ip6t_entry *)table_base)->comefrom != 0xeeeeeeec) { + printk("ASSERT: CPU #%u, %s comefrom(%p) = %X\n", + smp_processor_id(), + table->name, + &((struct ip6t_entry *)table_base)->comefrom, + ((struct ip6t_entry *)table_base)->comefrom); + } + ((struct ip6t_entry *)table_base)->comefrom = 0x57acc001; +#endif + /* For return from builtin chain */ back = get_entry(table_base, private->underflow[hook]); diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c index f9b83f91371a..e581190fb6c3 100644 --- a/trunk/net/netfilter/nf_conntrack_core.c +++ b/trunk/net/netfilter/nf_conntrack_core.c @@ -178,6 +178,9 @@ static struct { /* allocated slab cache + modules which uses this slab cache */ int use; + /* Initialization */ + int (*init_conntrack)(struct nf_conn *, u_int32_t); + } nf_ct_cache[NF_CT_F_NUM]; /* protect members of nf_ct_cache except of "use" */ @@ -205,8 +208,10 @@ nf_ct_proto_find_get(u_int16_t l3proto, u_int8_t protocol) preempt_disable(); p = __nf_ct_proto_find(l3proto, protocol); - if (!try_module_get(p->me)) - p = &nf_conntrack_generic_protocol; + if (p) { + if (!try_module_get(p->me)) + p = &nf_conntrack_generic_protocol; + } preempt_enable(); return p; @@ -224,8 +229,10 @@ nf_ct_l3proto_find_get(u_int16_t l3proto) preempt_disable(); p = __nf_ct_l3proto_find(l3proto); - if (!try_module_get(p->me)) - p = &nf_conntrack_generic_l3proto; + if (p) { + if (!try_module_get(p->me)) + p = &nf_conntrack_generic_l3proto; + } preempt_enable(); return p; diff --git a/trunk/net/netfilter/nf_conntrack_l3proto_generic.c b/trunk/net/netfilter/nf_conntrack_l3proto_generic.c index 3fc58e454d4e..7de4f06c63c5 100644 --- a/trunk/net/netfilter/nf_conntrack_l3proto_generic.c +++ b/trunk/net/netfilter/nf_conntrack_l3proto_generic.c @@ -94,4 +94,5 @@ struct nf_conntrack_l3proto nf_conntrack_generic_l3proto = { .print_conntrack = generic_print_conntrack, .prepare = generic_prepare, .get_features = generic_get_features, + .me = THIS_MODULE, }; diff --git a/trunk/net/netfilter/x_tables.c b/trunk/net/netfilter/x_tables.c index 17abf60f9570..00cf0a4f4d92 100644 --- a/trunk/net/netfilter/x_tables.c +++ b/trunk/net/netfilter/x_tables.c @@ -529,7 +529,6 @@ int xt_register_table(struct xt_table *table, /* Simplifies replace_table code. */ table->private = bootstrap; - rwlock_init(&table->lock); if (!xt_replace_table(table, 0, newinfo, &ret)) goto unlock; @@ -539,6 +538,7 @@ int xt_register_table(struct xt_table *table, /* save number of initial entries */ private->initial_entries = private->number; + rwlock_init(&table->lock); list_prepend(&xt[table->af].tables, table); ret = 0; diff --git a/trunk/net/sched/act_ipt.c b/trunk/net/sched/act_ipt.c index 37640c6fc014..6056d20ef429 100644 --- a/trunk/net/sched/act_ipt.c +++ b/trunk/net/sched/act_ipt.c @@ -69,11 +69,6 @@ ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int hook) DPRINTK("ipt_init_target: found %s\n", target->name); t->u.kernel.target = target; - ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t), - table, hook, 0, 0); - if (ret) - return ret; - if (t->u.kernel.target->checkentry && !t->u.kernel.target->checkentry(table, NULL, t->u.kernel.target, t->data,