Re: [46/74] net: restore ip source validation

Re: [46/74] net: restore ip source validation

[Randolf Pohl]

[...]

> --- a/include/linux/sysctl.h
> +++ b/include/linux/sysctl.h
> @@ -490,6 +490,7 @@ enum
>  	NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
>  	NET_IPV4_CONF_ARP_ACCEPT=21,
>  	NET_IPV4_CONF_ARP_NOTIFY=22,
> +	NET_IPV4_CONF_SRC_VMARK=24,
>  	__NET_IPV4_CONF_MAX
>  };
> 

Must these be contiguous, i.e. 23?

R.
-- 
Jetzt kostenlos herunterladen: Internet Explorer 8 und Mozilla Firefox 3.5 -
sicherer, schneller und einfacher! http://portal.gmx.net/de/go/atbrowser

Re: [46/74] net: restore ip source validation

[jamal]

On Fri, 2010-02-05 at 15:34 +0100, Randolf Pohl wrote:
> [...]
> 
> > --- a/include/linux/sysctl.h
> > +++ b/include/linux/sysctl.h
> > @@ -490,6 +490,7 @@ enum
> >  	NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
> >  	NET_IPV4_CONF_ARP_ACCEPT=21,
> >  	NET_IPV4_CONF_ARP_NOTIFY=22,
> > +	NET_IPV4_CONF_SRC_VMARK=24,
> >  	__NET_IPV4_CONF_MAX
> >  };
> > 
> 
> Must these be contiguous, i.e. 23?

The problem is elsewhere. Here's the fix.

--
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index b6e7aae..469193c 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -220,6 +220,7 @@ static const struct trans_ctl_table
trans_net_ipv4_conf_vars_table[] = {
        { NET_IPV4_CONF_PROMOTE_SECONDARIES,    "promote_secondaries" },
        { NET_IPV4_CONF_ARP_ACCEPT,             "arp_accept" },
        { NET_IPV4_CONF_ARP_NOTIFY,             "arp_notify" },
+       { NET_IPV4_CONF_SRC_VMARK,              "src_valid_mark" },
        {}
 };
---

cheers,
jamal

Re: [46/74] net: restore ip source validation

[Sven Joachim]

On 2010-02-05 15:51 +0100, jamal wrote:

> The problem is elsewhere. Here's the fix.
>
> --
> diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
> index b6e7aae..469193c 100644
> --- a/kernel/sysctl_check.c
> +++ b/kernel/sysctl_check.c
> @@ -220,6 +220,7 @@ static const struct trans_ctl_table
> trans_net_ipv4_conf_vars_table[] = {
>         { NET_IPV4_CONF_PROMOTE_SECONDARIES,    "promote_secondaries" },
>         { NET_IPV4_CONF_ARP_ACCEPT,             "arp_accept" },
>         { NET_IPV4_CONF_ARP_NOTIFY,             "arp_notify" },
> +       { NET_IPV4_CONF_SRC_VMARK,              "src_valid_mark" },
>         {}
>  };
> ---

Well spotted, that fixes it.  Your mailer is broken however, it
converted tabs into spaces, so I had to add the changed line manually.

Sven

Re: [46/74] net: restore ip source validation

[Eric W. Biederman]

Sven Joachim <svenjoac@gmx.de> writes:

> On 2010-02-05 15:51 +0100, jamal wrote:
>
>> The problem is elsewhere. Here's the fix.
>>
>> --
>> diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
>> index b6e7aae..469193c 100644
>> --- a/kernel/sysctl_check.c
>> +++ b/kernel/sysctl_check.c
>> @@ -220,6 +220,7 @@ static const struct trans_ctl_table
>> trans_net_ipv4_conf_vars_table[] = {
>>         { NET_IPV4_CONF_PROMOTE_SECONDARIES,    "promote_secondaries" },
>>         { NET_IPV4_CONF_ARP_ACCEPT,             "arp_accept" },
>>         { NET_IPV4_CONF_ARP_NOTIFY,             "arp_notify" },
>> +       { NET_IPV4_CONF_SRC_VMARK,              "src_valid_mark" },
>>         {}
>>  };
>> ---
>
> Well spotted, that fixes it.  Your mailer is broken however, it
> converted tabs into spaces, so I had to add the changed line manually.

Bah.  That DEVINET_SYSCTL_ENTRY requires having a binary sysctl
assigned, just to use as an index.

Which of course trips over all of the fine checks in sysctl_check.c to
keep people from assigning new binary sysctls by accident.

That is the only place in the kernel where he have that problem, I wonder
how much work it will be to finish untangling.

Eric

Re: [46/74] net: restore ip source validation

[Sven Joachim]

On 2010-02-05 21:17 +0100, Eric W. Biederman wrote:

> Bah.  That DEVINET_SYSCTL_ENTRY requires having a binary sysctl
> assigned, just to use as an index.
>
> Which of course trips over all of the fine checks in sysctl_check.c to
> keep people from assigning new binary sysctls by accident.
>
> That is the only place in the kernel where he have that problem, I wonder
> how much work it will be to finish untangling.

Isn't that already done in 2.6.33, looking at commit 83ac201b ?  Forgive
my ignorance, I am a layman.

Sen

Re: [46/74] net: restore ip source validation

[Eric W. Biederman]

Sven Joachim <svenjoac@gmx.de> writes:

> On 2010-02-05 21:17 +0100, Eric W. Biederman wrote:
>
>> Bah.  That DEVINET_SYSCTL_ENTRY requires having a binary sysctl
>> assigned, just to use as an index.
>>
>> Which of course trips over all of the fine checks in sysctl_check.c to
>> keep people from assigning new binary sysctls by accident.
>>
>> That is the only place in the kernel where he have that problem, I wonder
>> how much work it will be to finish untangling.
>
> Isn't that already done in 2.6.33, looking at commit 83ac201b ?  Forgive
> my ignorance, I am a layman.

In 2.6.33 the enumeration in sysctl.h still serves double duty as an index
into a per network device bitmap and as the binary sysctl number.  You are
correct that the rest of the binary sysctl code is decoupled in 2.6.33.

In 2.6.32 the implementation is also still coupled and that difference is
what caused problems for the backport.

I just wince whenever I noticed we have touched sysctl.h.

Eric

Re: [46/74] net: restore ip source validation

[Eric W. Biederman]

Sven Joachim <svenjoac@gmx.de> writes:

> On 2010-02-05 21:17 +0100, Eric W. Biederman wrote:
>
>> Bah.  That DEVINET_SYSCTL_ENTRY requires having a binary sysctl
>> assigned, just to use as an index.
>>
>> Which of course trips over all of the fine checks in sysctl_check.c to
>> keep people from assigning new binary sysctls by accident.
>>
>> That is the only place in the kernel where he have that problem, I wonder
>> how much work it will be to finish untangling.
>
> Isn't that already done in 2.6.33, looking at commit 83ac201b ?  Forgive
> my ignorance, I am a layman.

In 2.6.33 the enumeration in sysctl.h still serves double duty as an index
into a per network device bitmap and as the binary sysctl number.  You are
correct that the rest of the binary sysctl code is decoupled in 2.6.33.

In 2.6.32 the implementation is also still coupled and that difference is
what caused problems for the backport.

I just wince whenever I noticed we have touched sysctl.h.

Eric

[00/74] 2.6.32.8-stable review

[Greg KH]

This is the start of the stable review cycle for the 2.6.32.8 release.
There are 74 patches in this series, all will be posted as a response
to this one.  If anyone has any issues with these being applied, please
let us know.  If anyone is a maintainer of the proper subsystem, and
wants to add a Signed-off-by: line to the patch, please respond with it.

Due to travelling to FOSDEM, I have not been able to test this release
as well as I would have liked to.  Also, given the complexity of some of
these changes, it would be great if people could really test this
release to verify that it works properly.  All help here is greatly
appreciated.

Responses should be made by Sunday, Feb 7 00:00:00 UTC.
Anything received after that time might be too late.

The whole patch series can be found in one patch at:
	kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.32.8-rc1.gz
and the diffstat can be found below.

thanks,

greg k-h


 Documentation/kvm/api.txt                 |   36 ++
 Makefile                                  |    2 +-
 arch/blackfin/include/asm/page.h          |    5 +
 arch/frv/include/asm/page.h               |    2 -
 arch/powerpc/include/asm/elf.h            |    8 +-
 arch/powerpc/include/asm/thread_info.h    |    2 -
 arch/powerpc/kernel/process.c             |   12 -
 arch/s390/kernel/entry.S                  |    1 +
 arch/s390/kernel/entry64.S                |    1 +
 arch/sh/kernel/process_64.c               |    2 +-
 arch/sparc/include/asm/elf_64.h           |   13 +-
 arch/sparc/include/asm/thread_info_64.h   |    4 +-
 arch/sparc/kernel/process_64.c            |    8 -
 arch/x86/Kconfig                          |    6 -
 arch/x86/ia32/ia32_aout.c                 |   11 +-
 arch/x86/include/asm/cpu_debug.h          |  127 ------
 arch/x86/include/asm/elf.h                |   10 +-
 arch/x86/include/asm/hpet.h               |    1 +
 arch/x86/include/asm/kvm_host.h           |    1 +
 arch/x86/include/asm/thread_info.h        |    2 -
 arch/x86/kernel/amd_iommu.c               |    2 +-
 arch/x86/kernel/cpu/Makefile              |    2 -
 arch/x86/kernel/cpu/cpu_debug.c           |  688 -----------------------------
 arch/x86/kernel/hpet.c                    |    8 +
 arch/x86/kernel/process.c                 |   12 -
 arch/x86/kernel/process_64.c              |   11 +
 arch/x86/kernel/quirks.c                  |   13 +
 arch/x86/kernel/reboot.c                  |    9 +
 arch/x86/kernel/setup.c                   |   14 +-
 arch/x86/kvm/x86.c                        |   42 ++-
 arch/x86/mm/srat_64.c                     |    4 +-
 arch/x86/oprofile/nmi_int.c               |    3 +-
 drivers/acpi/bus.c                        |  163 +++++++
 drivers/ata/libata-core.c                 |   38 ++-
 drivers/ata/libata-eh.c                   |    5 +-
 drivers/block/pktcdvd.c                   |    2 +-
 drivers/char/random.c                     |    9 -
 drivers/connector/connector.c             |  175 --------
 drivers/firewire/core-card.c              |   42 ++-
 drivers/firewire/ohci.c                   |    4 +-
 drivers/gpu/drm/drm_gem.c                 |   13 -
 drivers/gpu/drm/i915/i915_debugfs.c       |    2 +-
 drivers/gpu/drm/i915/i915_dma.c           |    4 +-
 drivers/gpu/drm/i915/i915_drv.h           |    2 +-
 drivers/gpu/drm/i915/i915_gem.c           |   54 +--
 drivers/gpu/drm/i915/i915_irq.c           |   32 +-
 drivers/gpu/drm/i915/i915_reg.h           |    8 -
 drivers/gpu/drm/i915/intel_crt.c          |    2 +
 drivers/gpu/drm/i915/intel_display.c      |   26 +-
 drivers/gpu/drm/i915/intel_dp.c           |    6 +
 drivers/gpu/drm/i915/intel_hdmi.c         |    5 +
 drivers/gpu/drm/i915/intel_sdvo.c         |    3 +
 drivers/gpu/drm/i915/intel_tv.c           |    2 +
 drivers/infiniband/hw/ipath/ipath_fs.c    |    4 +-
 drivers/input/misc/winbond-cir.c          |    2 +-
 drivers/message/fusion/mptbase.c          |    2 +
 drivers/mtd/ubi/cdev.c                    |    1 -
 drivers/net/benet/be.h                    |    5 +
 drivers/net/benet/be_cmds.h               |    3 +-
 drivers/net/benet/be_main.c               |   25 +-
 drivers/net/e1000/e1000.h                 |    2 +
 drivers/net/e1000/e1000_main.c            |   33 +-
 drivers/net/e1000e/e1000.h                |    1 +
 drivers/net/e1000e/netdev.c               |   45 +-
 drivers/net/sky2.c                        |    3 +-
 drivers/net/starfire.c                    |    5 +-
 drivers/net/wireless/ath/ath9k/hw.c       |    7 +-
 drivers/net/wireless/ath/ath9k/main.c     |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c |    2 +-
 drivers/regulator/wm8350-regulator.c      |    4 +-
 drivers/s390/block/dasd.c                 |    8 +-
 drivers/s390/block/dasd_eckd.c            |    2 +-
 drivers/s390/block/dasd_ioctl.c           |    7 +-
 drivers/s390/block/dasd_proc.c            |    7 +-
 drivers/s390/crypto/zcrypt_pcicc.c        |    2 +
 drivers/s390/crypto/zcrypt_pcixcc.c       |    2 +
 drivers/scsi/scsi_lib.c                   |    2 +-
 drivers/serial/uartlite.c                 |    2 +-
 drivers/usb/host/r8a66597-hcd.c           |   17 +-
 drivers/video/imxfb.c                     |    6 +-
 drivers/video/mx3fb.c                     |   12 +-
 fs/9p/vfs_super.c                         |    3 +-
 fs/affs/affs.h                            |    2 +-
 fs/affs/namei.c                           |    7 +-
 fs/affs/super.c                           |   31 +-
 fs/affs/symlink.c                         |    7 +-
 fs/bfs/inode.c                            |   43 +-
 fs/binfmt_aout.c                          |    1 +
 fs/binfmt_elf.c                           |   27 +-
 fs/binfmt_elf_fdpic.c                     |   16 +-
 fs/binfmt_flat.c                          |    1 +
 fs/binfmt_som.c                           |    1 +
 fs/bio-integrity.c                        |    3 +-
 fs/bio.c                                  |    7 +-
 fs/exec.c                                 |   36 +-
 fs/fuse/file.c                            |    3 +
 fs/romfs/super.c                          |    1 +
 include/linux/acpi.h                      |   16 +
 include/linux/binfmts.h                   |    1 +
 include/linux/connector.h                 |   32 --
 include/linux/inetdevice.h                |    1 +
 include/linux/kvm.h                       |    9 +
 include/linux/libata.h                    |    3 +
 include/linux/pagemap.h                   |    2 +
 include/linux/sched.h                     |    2 +-
 include/linux/sysctl.h                    |    1 +
 include/net/netrom.h                      |    2 +
 kernel/cred.c                             |    2 +-
 kernel/time/clocksource.c                 |    4 +-
 mm/filemap.c                              |  103 +++--
 mm/page_alloc.c                           |    5 +-
 mm/vmalloc.c                              |  109 ++++-
 net/ax25/ax25_out.c                       |    6 +
 net/core/sock.c                           |    4 +
 net/ipv4/devinet.c                        |    1 +
 net/ipv4/fib_frontend.c                   |    2 +
 net/mac80211/driver-trace.h               |    2 +-
 net/netrom/nr_route.c                     |   11 +-
 net/packet/af_packet.c                    |   19 +-
 net/rose/rose_link.c                      |    8 +
 net/rose/rose_route.c                     |    5 +
 security/selinux/hooks.c                  |    2 +-
 122 files changed, 952 insertions(+), 1461 deletions(-)

[46/74] net: restore ip source validation

[Greg KH]

2.6.32-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Jamal Hadi Salim <hadi@cyberus.ca>

[ Upstream commit 28f6aeea3f12d37bd258b2c0d5ba891bff4ec479 ]

when using policy routing and the skb mark:
there are cases where a back path validation requires us
to use a different routing table for src ip validation than
the one used for mapping ingress dst ip.
One such a case is transparent proxying where we pretend to be
the destination system and therefore the local table
is used for incoming packets but possibly a main table would
be used on outbound.
Make the default behavior to allow the above and if users
need to turn on the symmetry via sysctl src_valid_mark

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 include/linux/inetdevice.h |    1 +
 include/linux/sysctl.h     |    1 +
 net/ipv4/devinet.c         |    1 +
 net/ipv4/fib_frontend.c    |    2 ++
 4 files changed, 5 insertions(+)

--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -83,6 +83,7 @@ static inline void ipv4_devconf_setall(s
 #define IN_DEV_FORWARD(in_dev)		IN_DEV_CONF_GET((in_dev), FORWARDING)
 #define IN_DEV_MFORWARD(in_dev)		IN_DEV_ANDCONF((in_dev), MC_FORWARDING)
 #define IN_DEV_RPFILTER(in_dev)		IN_DEV_MAXCONF((in_dev), RP_FILTER)
+#define IN_DEV_SRC_VMARK(in_dev)    	IN_DEV_ORCONF((in_dev), SRC_VMARK)
 #define IN_DEV_SOURCE_ROUTE(in_dev)	IN_DEV_ANDCONF((in_dev), \
 						       ACCEPT_SOURCE_ROUTE)
 #define IN_DEV_BOOTP_RELAY(in_dev)	IN_DEV_ANDCONF((in_dev), BOOTP_RELAY)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -490,6 +490,7 @@ enum
 	NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
 	NET_IPV4_CONF_ARP_ACCEPT=21,
 	NET_IPV4_CONF_ARP_NOTIFY=22,
+	NET_IPV4_CONF_SRC_VMARK=24,
 	__NET_IPV4_CONF_MAX
 };
 
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1450,6 +1450,7 @@ static struct devinet_sysctl_table {
 		DEVINET_SYSCTL_RW_ENTRY(SEND_REDIRECTS, "send_redirects"),
 		DEVINET_SYSCTL_RW_ENTRY(ACCEPT_SOURCE_ROUTE,
 					"accept_source_route"),
+		DEVINET_SYSCTL_RW_ENTRY(SRC_VMARK, "src_valid_mark"),
 		DEVINET_SYSCTL_RW_ENTRY(PROXY_ARP, "proxy_arp"),
 		DEVINET_SYSCTL_RW_ENTRY(MEDIUM_ID, "medium_id"),
 		DEVINET_SYSCTL_RW_ENTRY(BOOTP_RELAY, "bootp_relay"),
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -251,6 +251,8 @@ int fib_validate_source(__be32 src, __be
 	if (in_dev) {
 		no_addr = in_dev->ifa_list == NULL;
 		rpf = IN_DEV_RPFILTER(in_dev);
+		if (mark && !IN_DEV_SRC_VMARK(in_dev))
+			fl.mark = 0;
 	}
 	rcu_read_unlock();
 

Re: [46/74] net: restore ip source validation

[Sven Joachim]

On 2010-02-04 18:12 +0100, Greg KH wrote:

> 2.6.32-stable review patch.  If anyone has any objections, please let us know.

It's a bit hard to believe, but it is this patch which triggered the
boot-time crashes¹ that several people, including me, observed.
Reverting it avoids the kernel panic, and I'm running a kernel with the
other 73 patches applied right now.

Sven


¹ http://nelide.cz/downloads/2.6.32.8-crash.png

> ------------------
>
> From: Jamal Hadi Salim <hadi@cyberus.ca>
>
> [ Upstream commit 28f6aeea3f12d37bd258b2c0d5ba891bff4ec479 ]
>
> when using policy routing and the skb mark:
> there are cases where a back path validation requires us
> to use a different routing table for src ip validation than
> the one used for mapping ingress dst ip.
> One such a case is transparent proxying where we pretend to be
> the destination system and therefore the local table
> is used for incoming packets but possibly a main table would
> be used on outbound.
> Make the default behavior to allow the above and if users
> need to turn on the symmetry via sysctl src_valid_mark
>
> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
>
> ---
>  include/linux/inetdevice.h |    1 +
>  include/linux/sysctl.h     |    1 +
>  net/ipv4/devinet.c         |    1 +
>  net/ipv4/fib_frontend.c    |    2 ++
>  4 files changed, 5 insertions(+)
>
> --- a/include/linux/inetdevice.h
> +++ b/include/linux/inetdevice.h
> @@ -83,6 +83,7 @@ static inline void ipv4_devconf_setall(s
>  #define IN_DEV_FORWARD(in_dev)		IN_DEV_CONF_GET((in_dev), FORWARDING)
>  #define IN_DEV_MFORWARD(in_dev)		IN_DEV_ANDCONF((in_dev), MC_FORWARDING)
>  #define IN_DEV_RPFILTER(in_dev)		IN_DEV_MAXCONF((in_dev), RP_FILTER)
> +#define IN_DEV_SRC_VMARK(in_dev)    	IN_DEV_ORCONF((in_dev), SRC_VMARK)
>  #define IN_DEV_SOURCE_ROUTE(in_dev)	IN_DEV_ANDCONF((in_dev), \
>  						       ACCEPT_SOURCE_ROUTE)
>  #define IN_DEV_BOOTP_RELAY(in_dev)	IN_DEV_ANDCONF((in_dev), BOOTP_RELAY)
> --- a/include/linux/sysctl.h
> +++ b/include/linux/sysctl.h
> @@ -490,6 +490,7 @@ enum
>  	NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
>  	NET_IPV4_CONF_ARP_ACCEPT=21,
>  	NET_IPV4_CONF_ARP_NOTIFY=22,
> +	NET_IPV4_CONF_SRC_VMARK=24,
>  	__NET_IPV4_CONF_MAX
>  };
>  
> --- a/net/ipv4/devinet.c
> +++ b/net/ipv4/devinet.c
> @@ -1450,6 +1450,7 @@ static struct devinet_sysctl_table {
>  		DEVINET_SYSCTL_RW_ENTRY(SEND_REDIRECTS, "send_redirects"),
>  		DEVINET_SYSCTL_RW_ENTRY(ACCEPT_SOURCE_ROUTE,
>  					"accept_source_route"),
> +		DEVINET_SYSCTL_RW_ENTRY(SRC_VMARK, "src_valid_mark"),
>  		DEVINET_SYSCTL_RW_ENTRY(PROXY_ARP, "proxy_arp"),
>  		DEVINET_SYSCTL_RW_ENTRY(MEDIUM_ID, "medium_id"),
>  		DEVINET_SYSCTL_RW_ENTRY(BOOTP_RELAY, "bootp_relay"),
> --- a/net/ipv4/fib_frontend.c
> +++ b/net/ipv4/fib_frontend.c
> @@ -251,6 +251,8 @@ int fib_validate_source(__be32 src, __be
>  	if (in_dev) {
>  		no_addr = in_dev->ifa_list == NULL;
>  		rpf = IN_DEV_RPFILTER(in_dev);
> +		if (mark && !IN_DEV_SRC_VMARK(in_dev))
> +			fl.mark = 0;
>  	}
>  	rcu_read_unlock();