From: Greg Kroah-Hartman Date: Thu, 21 Jun 2018 03:51:09 +0000 (+0900) Subject: drop 4.4 network patch X-Git-Tag: v4.17.3~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f61dbd8a60b63091b82e3645fa6f45c9bedb777f;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.4 network patch --- diff --git a/queue-4.4/net-dsa-add-error-handling-for-pskb_trim_rcsum.patch b/queue-4.4/net-dsa-add-error-handling-for-pskb_trim_rcsum.patch deleted file mode 100644 index 2a0a737d10e..00000000000 --- a/queue-4.4/net-dsa-add-error-handling-for-pskb_trim_rcsum.patch +++ /dev/null @@ -1,33 +0,0 @@ -From foo@baz Thu Jun 21 12:38:22 JST 2018 -From: Zhouyang Jia -Date: Mon, 11 Jun 2018 13:26:35 +0800 -Subject: net: dsa: add error handling for pskb_trim_rcsum - -From: Zhouyang Jia - -[ Upstream commit 349b71d6f427ff8211adf50839dbbff3f27c1805 ] - -When pskb_trim_rcsum fails, the lack of error-handling code may -cause unexpected results. - -This patch adds error-handling code after calling pskb_trim_rcsum. - -Signed-off-by: Zhouyang Jia -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/dsa/tag_trailer.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/net/dsa/tag_trailer.c -+++ b/net/dsa/tag_trailer.c -@@ -85,7 +85,8 @@ static int trailer_rcv(struct sk_buff *s - if (source_port >= DSA_MAX_PORTS || ds->ports[source_port] == NULL) - goto out_drop; - -- pskb_trim_rcsum(skb, skb->len - 4); -+ if (pskb_trim_rcsum(skb, skb->len - 4)) -+ return NULL; - - skb->dev = ds->ports[source_port]; - skb_push(skb, ETH_HLEN); diff --git a/queue-4.4/series b/queue-4.4/series index ca1e841edb9..08817b89ab6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -9,5 +9,4 @@ tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch btrfs-make-raid6-rebuild-retry-more.patch usb-musb-fix-remote-wakeup-racing-with-suspend.patch bonding-re-evaluate-force_primary-when-the-primary-slave-name-changes.patch -net-dsa-add-error-handling-for-pskb_trim_rcsum.patch tcp-verify-the-checksum-of-the-first-data-segment-in-a-new-connection.patch