| Message ID | 20101002112419.248437367@gulag1.americas.sgi.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Robin Holt <holt@sgi.com> Date: Sat, 02 Oct 2010 06:24:06 -0500 > Subject: [Patch] Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows. > > On a 16TB x86_64 machine, sysctl_tcp_mem[2], sysctl_udp_mem[2], and > sysctl_sctp_mem[2] can integer overflow. Set limit such that they are > maximized without overflowing. > > Signed-off-by: Robin Holt <holt@sgi.com> Robin please resubmit this with the SCTP bits included. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 05, 2010 at 02:50:32PM -0700, David Miller wrote: > From: Robin Holt <holt@sgi.com> > Date: Sat, 02 Oct 2010 06:24:06 -0500 > > > Subject: [Patch] Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows. > > > > On a 16TB x86_64 machine, sysctl_tcp_mem[2], sysctl_udp_mem[2], and > > sysctl_sctp_mem[2] can integer overflow. Set limit such that they are > > maximized without overflowing. > > > > Signed-off-by: Robin Holt <holt@sgi.com> > > Robin please resubmit this with the SCTP bits included. David, I did not mean to blow you off. I was not going to resubmit because Eric's patch is the preferred direction. I had been given an indication that my patch was preferred, but that indicator changed. Robin -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le lundi 18 octobre 2010 à 12:43 -0500, Robin Holt a écrit : > On Tue, Oct 05, 2010 at 02:50:32PM -0700, David Miller wrote: > > From: Robin Holt <holt@sgi.com> > > Date: Sat, 02 Oct 2010 06:24:06 -0500 > > > > > Subject: [Patch] Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows. > > > > > > On a 16TB x86_64 machine, sysctl_tcp_mem[2], sysctl_udp_mem[2], and > > > sysctl_sctp_mem[2] can integer overflow. Set limit such that they are > > > maximized without overflowing. > > > > > > Signed-off-by: Robin Holt <holt@sgi.com> > > > > Robin please resubmit this with the SCTP bits included. > > David, > > I did not mean to blow you off. I was not going to resubmit because > Eric's patch is the preferred direction. I had been given an indication > that my patch was preferred, but that indicator changed. > Maybe there is some misunderstanding. My patch was for net-next kernels (not before 2.6.37), while yours was applicable to previous kernels. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 18, 2010 at 07:52:28PM +0200, Eric Dumazet wrote: > Le lundi 18 octobre 2010 à 12:43 -0500, Robin Holt a écrit : > > On Tue, Oct 05, 2010 at 02:50:32PM -0700, David Miller wrote: > > > From: Robin Holt <holt@sgi.com> > > > Date: Sat, 02 Oct 2010 06:24:06 -0500 > > > > > > > Subject: [Patch] Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows. > > > > > > > > On a 16TB x86_64 machine, sysctl_tcp_mem[2], sysctl_udp_mem[2], and > > > > sysctl_sctp_mem[2] can integer overflow. Set limit such that they are > > > > maximized without overflowing. > > > > > > > > Signed-off-by: Robin Holt <holt@sgi.com> > > > > > > Robin please resubmit this with the SCTP bits included. > > > > David, > > > > I did not mean to blow you off. I was not going to resubmit because > > Eric's patch is the preferred direction. I had been given an indication > > that my patch was preferred, but that indicator changed. > > > > Maybe there is some misunderstanding. > > My patch was for net-next kernels (not before 2.6.37), while yours was > applicable to previous kernels. Ah. I will resubmit then. Sorry for the confusion, Robin -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: pv1010932/net/ipv4/tcp.c =================================================================== --- pv1010932.orig/net/ipv4/tcp.c 2010-10-02 06:11:59.737449853 -0500 +++ pv1010932/net/ipv4/tcp.c 2010-10-02 06:12:35.445454593 -0500 @@ -3271,12 +3271,14 @@ void __init tcp_init(void) /* Set the pressure threshold to be a fraction of global memory that * is up to 1/2 at 256 MB, decreasing toward zero with the amount of - * memory, with a floor of 128 pages. + * memory, with a floor of 128 pages, and a ceiling that prevents an + * integer overflow. */ nr_pages = totalram_pages - totalhigh_pages; limit = min(nr_pages, 1UL<<(28-PAGE_SHIFT)) >> (20-PAGE_SHIFT); limit = (limit * (nr_pages >> (20-PAGE_SHIFT))) >> (PAGE_SHIFT-11); limit = max(limit, 128UL); + limit = min(limit, INT_MAX * 4UL / 3 / 2); sysctl_tcp_mem[0] = limit / 4 * 3; sysctl_tcp_mem[1] = limit; sysctl_tcp_mem[2] = sysctl_tcp_mem[0] * 2; Index: pv1010932/net/ipv4/udp.c =================================================================== --- pv1010932.orig/net/ipv4/udp.c 2010-10-02 06:11:59.737449853 -0500 +++ pv1010932/net/ipv4/udp.c 2010-10-02 06:12:35.453453784 -0500 @@ -2167,12 +2167,14 @@ void __init udp_init(void) udp_table_init(&udp_table, "UDP"); /* Set the pressure threshold up by the same strategy of TCP. It is a * fraction of global memory that is up to 1/2 at 256 MB, decreasing - * toward zero with the amount of memory, with a floor of 128 pages. + * toward zero with the amount of memory, with a floor of 128 pages, + * and a ceiling that prevents an integer overflow. */ nr_pages = totalram_pages - totalhigh_pages; limit = min(nr_pages, 1UL<<(28-PAGE_SHIFT)) >> (20-PAGE_SHIFT); limit = (limit * (nr_pages >> (20-PAGE_SHIFT))) >> (PAGE_SHIFT-11); limit = max(limit, 128UL); + limit = min(limit, INT_MAX * 4UL / 3 / 2); sysctl_udp_mem[0] = limit / 4 * 3; sysctl_udp_mem[1] = limit; sysctl_udp_mem[2] = sysctl_udp_mem[0] * 2;
Subject: [Patch] Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows. On a 16TB x86_64 machine, sysctl_tcp_mem[2], sysctl_udp_mem[2], and sysctl_sctp_mem[2] can integer overflow. Set limit such that they are maximized without overflowing. Signed-off-by: Robin Holt <holt@sgi.com> To: Willy Tarreau <w@1wt.eu> To: linux-kernel@vger.kernel.org To: netdev@vger.kernel.org Cc: "David S. Miller" <davem@davemloft.net> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Cc: "Pekka Savola (ipv6)" <pekkas@netcore.fi> Cc: James Morris <jmorris@namei.org> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: Patrick McHardy <kaber@trash.net> --- net/ipv4/tcp.c | 4 +++- net/ipv4/udp.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html