lkml.org 
[lkml]   [2012]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[35/42] igmp: Avoid zero delay when receiving odd mixture of IGMP queries
    3.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Hutchings <ben@decadent.org.uk>

    commit a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 upstream.

    Commit 5b7c84066733c5dfb0e4016d939757b38de189e4 ('ipv4: correct IGMP
    behavior on v3 query during v2-compatibility mode') added yet another
    case for query parsing, which can result in max_delay = 0. Substitute
    a value of 1, as in the usual v3 case.

    Reported-by: Simon McVittie <smcv@debian.org>
    References: http://bugs.debian.org/654876
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

    ---
    net/ipv4/igmp.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/net/ipv4/igmp.c
    +++ b/net/ipv4/igmp.c
    @@ -875,6 +875,8 @@ static void igmp_heard_query(struct in_d
    * to be intended in a v3 query.
    */
    max_delay = IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE);
    + if (!max_delay)
    + max_delay = 1; /* can't mod w/ 0 */
    } else { /* v3 */
    if (!pskb_may_pull(skb, sizeof(struct igmpv3_query)))
    return;



    \
     
     \ /
      Last update: 2012-01-11 00:21    [W:0.030 / U:0.552 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site