ipv4: Handle PMTU in all ICMP error handlers.

[deliverable/linux.git] / net / ipv4 / ping.c

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 6e930c7174dd2e9d755e6c64c5e562974c33aa72..340fcf29a966399c596dac530f27fb1fb3651974 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -207,17 +207,22 @@ static int ping_init_sock(struct sock *sk)
        gid_t range[2];
        struct group_info *group_info = get_current_groups();
        int i, j, count = group_info->ngroups;
+       kgid_t low, high;
 
        inet_get_ping_group_range_net(net, range, range+1);
+       low = make_kgid(&init_user_ns, range[0]);
+       high = make_kgid(&init_user_ns, range[1]);
+       if (!gid_valid(low) || !gid_valid(high) || gid_lt(high, low))
+               return -EACCES;
+
        if (range[0] <= group && group <= range[1])
                return 0;
 
        for (i = 0; i < group_info->nblocks; i++) {
                int cp_count = min_t(int, NGROUPS_PER_BLOCK, count);
-
                for (j = 0; j < cp_count; j++) {
-                       group = group_info->blocks[i][j];
-                       if (range[0] <= group && group <= range[1])
+                       kgid_t gid = group_info->blocks[i][j];
+                       if (gid_lte(low, gid) && gid_lte(gid, high))
                                return 0;
                }
 
@@ -366,6 +371,7 @@ void ping_err(struct sk_buff *skb, u32 info)
                break;
        case ICMP_DEST_UNREACH:
                if (code == ICMP_FRAG_NEEDED) { /* Path MTU discovery */
+                       ipv4_sk_update_pmtu(skb, sk, info);
                        if (inet_sock->pmtudisc != IP_PMTUDISC_DONT) {
                                err = EMSGSIZE;
                                harderr = 1;