From: Alan Cox Date: Fri, 23 Nov 2007 20:21:07 +0000 (-0500) Subject: Linux 2.2.15pre17 X-Git-Tag: 2.2.15pre17 X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=fccb02716210bfbcce6abbfc9aae00e159aeb9b5;p=history.git Linux 2.2.15pre17 o Revert the alpha FPU misfix (Richard Henderson) o Really apply the typo fix this time (Barry K. Nathan) o Fix ISDN symbol collision (Arjan Van de Ven) o Loose UDP masquerade is now configurable so security concious users can disable it and game freaks turn it on (Nigel Metheringham) --- diff --git a/Documentation/Configure.help b/Documentation/Configure.help index 5a7885a7b279..bcd5a903df5b 100644 --- a/Documentation/Configure.help +++ b/Documentation/Configure.help @@ -2550,6 +2550,20 @@ CONFIG_IP_MASQUERADE kernel whenever you want; read Documentation/modules.txt for details. +IP: UDP masquerading loose checking +CONFIG_IP_MASQUERADE_UDP_LOOSE + Whether UDP masquerading does address checking in a loose fashion. + + If you say Y here, then UDP masqueraded connections will allow + any external system to be connect back through the firewall to the + port on the internal machine. However it will allow the more + efficient use of masqueraded ports, and may be required for some + gaming uses. + + You should only say Y here if you understand the consequences since + it will open your internal network to external probing and potential + attacks. In all other cases choose N + IP: ICMP masquerading CONFIG_IP_MASQUERADE_ICMP The basic masquerade code described for "IP: masquerading" above @@ -6549,8 +6563,8 @@ CONFIG_DEC_ELCP_OLD This driver is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). - The module will be called tulip.o. If you want to compile it as a - module, say M here and read Documentation/modules.txt as well as + The module will be called old_tulip.o. If you want to compile it as + a module, say M here and read Documentation/modules.txt as well as Documentation/networking/net-modules.txt. Digi Intl. RightSwitch support diff --git a/Makefile b/Makefile index bfb55ec2e7e6..2d6eb92e5caf 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 2 SUBLEVEL = 15 -EXTRAVERSION = pre16 +EXTRAVERSION = pre17 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index 15395d2b6c53..03225a5d6ae6 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -417,13 +417,8 @@ do_entIF(unsigned long type, unsigned long a1, /* EV4 does not implement anything except normal rounding. Everything else will come here as an illegal instruction. Emulate them. */ - if (alpha_fp_emul(regs.pc)) - { - /* Increment the PC so that the program in - user space continues */ - regs.pc += 4; + if (alpha_fp_emul(regs.pc - 4)) return; - } } send_sig(SIGILL, current, 1); break; diff --git a/drivers/isdn/avmb1/b1dma.c b/drivers/isdn/avmb1/b1dma.c index d61b883752a0..1785e1740212 100644 --- a/drivers/isdn/avmb1/b1dma.c +++ b/drivers/isdn/avmb1/b1dma.c @@ -40,7 +40,7 @@ static char *revision = "$Revision: 1.3 $"; MODULE_AUTHOR("Carsten Paeth "); -int suppress_pollack = 0; +static int suppress_pollack = 0; MODULE_PARM(suppress_pollack, "0-1i"); /* ------------------------------------------------------------- */ diff --git a/drivers/isdn/avmb1/c4.c b/drivers/isdn/avmb1/c4.c index 05218333a451..7e4f1f1c3da8 100644 --- a/drivers/isdn/avmb1/c4.c +++ b/drivers/isdn/avmb1/c4.c @@ -68,7 +68,7 @@ static char *revision = "$Revision: 1.5 $"; /* ------------------------------------------------------------- */ -int suppress_pollack = 0; +static int suppress_pollack = 0; MODULE_AUTHOR("Carsten Paeth "); diff --git a/net/ipv4/Config.in b/net/ipv4/Config.in index 8982bc1e971a..eb4fd90084ec 100644 --- a/net/ipv4/Config.in +++ b/net/ipv4/Config.in @@ -41,6 +41,7 @@ if [ "$CONFIG_IP_FIREWALL" = "y" ]; then bool 'IP: masquerading' CONFIG_IP_MASQUERADE if [ "$CONFIG_IP_MASQUERADE" != "n" ]; then comment 'Protocol-specific masquerading support will be built as modules.' + bool 'IP: UDP masquerading loose checking' CONFIG_IP_MASQUERADE_UDP_LOOSE bool 'IP: ICMP masquerading' CONFIG_IP_MASQUERADE_ICMP comment 'Protocol-specific masquerading support will be built as modules.' if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then diff --git a/net/ipv4/ip_masq.c b/net/ipv4/ip_masq.c index 8f00409ff40e..df8186cc6768 100644 --- a/net/ipv4/ip_masq.c +++ b/net/ipv4/ip_masq.c @@ -411,12 +411,6 @@ struct ip_fw_masq *ip_masq_expire = &ip_masq_dummy; #define MASQ_DADDR_PASS (IP_MASQ_F_NO_DADDR|IP_MASQ_F_DLOOSE) #define MASQ_DPORT_PASS (IP_MASQ_F_NO_DPORT|IP_MASQ_F_DLOOSE) -/* - * By default enable dest loose semantics - */ -#define CONFIG_IP_MASQ_LOOSE_DEFAULT 1 - - /* * Set masq expiration (deletion) and adds timer, * if timeout==0 cancel expiration. @@ -937,7 +931,7 @@ struct ip_masq * ip_masq_new(int proto, __u32 maddr, __u16 mport, __u32 saddr, _ atomic_set(&ms->refcnt,0); if (proto == IPPROTO_UDP && !mport) -#ifdef CONFIG_IP_MASQ_LOOSE_DEFAULT +#ifdef CONFIG_IP_MASQUERADE_UDP_LOOSE /* * Flag this tunnel as "dest loose" *