3.7-stable review patch.  If anyone has any objections, please let me know.

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


From: Cong Wang <xiyou.wangc...@gmail.com>

[ Upstream commit c9be4a5c49cf51cc70a993f004c5bb30067a65ce ]

A regression is introduced by the following commit:

        commit 4d52cfbef6266092d535237ba5a4b981458ab171
        Author: Eric Dumazet <eric.duma...@gmail.com>
        Date:   Tue Jun 2 00:42:16 2009 -0700

            net: ipv4/ip_sockglue.c cleanups

            Pure cleanups

but it is not a pure cleanup...

        -               if (val != -1 && (val < 1 || val>255))
        +               if (val != -1 && (val < 0 || val > 255))

Since there is no reason provided to allow ttl=0, change it back.

Reported-by: nitin padalia <padalia.ni...@gmail.com>
Cc: nitin padalia <padalia.ni...@gmail.com>
Cc: Eric Dumazet <eric.duma...@gmail.com>
Cc: David S. Miller <da...@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangc...@gmail.com>
Acked-by: Eric Dumazet <eduma...@google.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 net/ipv4/ip_sockglue.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -590,7 +590,7 @@ static int do_ip_setsockopt(struct sock
        case IP_TTL:
                if (optlen < 1)
                        goto e_inval;
-               if (val != -1 && (val < 0 || val > 255))
+               if (val != -1 && (val < 1 || val > 255))
                        goto e_inval;
                inet->uc_ttl = val;
                break;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to