From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:32846 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750920AbdALUzC (ORCPT ); Thu, 12 Jan 2017 15:55:02 -0500 Subject: Patch "gro: use min_t() in skb_gro_reset_offset()" has been added to the 4.4-stable tree To: edumazet@google.com, davem@davemloft.net, fengguang.wu@intel.com, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 12 Jan 2017 21:38:05 +0100 Message-ID: <1484253485100178@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From foo@baz Thu Jan 12 21:36:14 CET 2017 From: Eric Dumazet Date: Tue, 10 Jan 2017 19:52:43 -0800 Subject: gro: use min_t() in skb_gro_reset_offset() From: Eric Dumazet [ 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 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- 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