Patch "gro: use min_t() in skb_gro_reset_offset()" has been added to the 4.4-stable tree

Patch "gro: use min_t() in skb_gro_reset_offset()" has been added to the 4.4-stable tree

[gregkh]

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

    gro: use min_t() in skb_gro_reset_offset()

to the 4.4-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:
     gro-use-min_t-in-skb_gro_reset_offset.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Thu Jan 12 21:36:14 CET 2017
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 10 Jan 2017 19:52:43 -0800
Subject: gro: use min_t() in skb_gro_reset_offset()

From: Eric Dumazet <edumazet@google.com>


[ Upstream commit 7cfd5fd5a9813f1430290d20c0fead9b4582a307 ]

On 32bit arches, (skb->end - skb->data) is not 'unsigned int',
so we shall use min_t() instead of min() to avoid a compiler error.

Fixes: 1272ce87fa01 ("gro: Enter slow-path if there is no tailroom")
Reported-by: kernel test robot <fengguang.wu@intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/core/dev.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4187,8 +4187,9 @@ static void skb_gro_reset_offset(struct
 	    pinfo->nr_frags &&
 	    !PageHighMem(skb_frag_page(frag0))) {
 		NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
-		NAPI_GRO_CB(skb)->frag0_len = min(skb_frag_size(frag0),
-						  skb->end - skb->tail);
+		NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
+						    skb_frag_size(frag0),
+						    skb->end - skb->tail);
 	}
 }
 


Patches currently in stable-queue which might be from edumazet@google.com are

queue-4.4/gro-disable-frag0-optimization-on-ipv6-ext-headers.patch
queue-4.4/net-sched-fix-soft-lockup-in-tc_classify.patch
queue-4.4/gro-use-min_t-in-skb_gro_reset_offset.patch
queue-4.4/gro-enter-slow-path-if-there-is-no-tailroom.patch