This is a note to let you know that I've just added the patch titled

    ipv4: fix for ip_options_rcv_srr() daddr update.

to the 3.0-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ipv4-fix-for-ip_options_rcv_srr-daddr-update.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From bcf91bc1ef139e385d76fabbc9856675b973e3e6 Mon Sep 17 00:00:00 2001
From: Li Wei <[email protected]>
Date: Tue, 8 Nov 2011 21:39:28 +0000
Subject: ipv4: fix for ip_options_rcv_srr() daddr update.


From: Li Wei <[email protected]>

[ Upstream commit b12f62efb8ec0b9523bdb6c2d412c07193086de9 ]

When opt->srr_is_hit is set skb_rtable(skb) has been updated for
'nexthop' and iph->daddr should always equals to skb_rtable->rt_dst
holds, We need update iph->daddr either.

Signed-off-by: Li Wei <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 net/ipv4/ip_options.c |    1 +
 1 file changed, 1 insertion(+)

--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -640,6 +640,7 @@ int ip_options_rcv_srr(struct sk_buff *s
        }
        if (srrptr <= srrspace) {
                opt->srr_is_hit = 1;
+               iph->daddr = nexthop;
                opt->is_changed = 1;
        }
        return 0;


Patches currently in stable-queue which might be from [email protected] are

queue-3.0/ipv4-fix-wrong-order-of-ip_rt_get_source-and-update-iph-daddr.patch
queue-3.0/ipv4-fix-for-ip_options_rcv_srr-daddr-update.patch
queue-3.0/ipv4-save-nexthop-address-of-lsrr-ssrr-option-to-ipcb.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to