lkml.org 
[lkml]   [2005]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/7] [IPV4]: Fix DST leak in icmp_push_reply()
    -stable review patch.  If anyone has any  objections, please let us know.
    ------------------

    Based upon a bug report and initial patch by
    Ollie Wild.

    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: "David S. Miller" <davem@davemloft.net>
    Signed-off-by: Chris Wright <chrisw@osdl.org>
    ---
    net/ipv4/icmp.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    Index: linux-2.6.12.y/net/ipv4/icmp.c
    ===================================================================
    --- linux-2.6.12.y.orig/net/ipv4/icmp.c
    +++ linux-2.6.12.y/net/ipv4/icmp.c
    @@ -349,12 +349,12 @@ static void icmp_push_reply(struct icmp_
    {
    struct sk_buff *skb;

    - ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param,
    - icmp_param->data_len+icmp_param->head_len,
    - icmp_param->head_len,
    - ipc, rt, MSG_DONTWAIT);
    -
    - if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) {
    + if (ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param,
    + icmp_param->data_len+icmp_param->head_len,
    + icmp_param->head_len,
    + ipc, rt, MSG_DONTWAIT) < 0)
    + ip_flush_pending_frames(icmp_socket->sk);
    + else if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) {
    struct icmphdr *icmph = skb->h.icmph;
    unsigned int csum = 0;
    struct sk_buff *skb1;
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-08-26 21:26    [W:4.057 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site