[SRU][Xenial][PATCH 0/1] Revert "sit: reload iphdr in ipip6_rcv"

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU][Xenial][PATCH 0/1] Revert "sit: reload iphdr in ipip6_rcv"

Joseph Salisbury-3
BugLink: http://bugs.launchpad.net/bugs/1772775

== SRU Justification ==
A regression was introduce in Xenial linux-image-4.4.0-127-generic.  It
was found that this regression was introduced by mainline commit
b699d0035836.  This commit was applied to Xenial via the 4.4.128 upstream stable
updates.  

Upstream decided to revert this commit in mainline commit f4eb17e1efe5,
which was added in v4.12-rc5.

== Fix ==
f4eb17e1efe5 ("Revert "sit: reload iphdr in ipip6_rcv"")

== Regression Potential ==
Low.  This is a revert request to resolve a regression.  The revert was
also performed upstream.  

== Test Case ==
A test kernel was built with this patch and tested by the original bug reporter.
The bug reporter states the test kernel resolved the bug.

David S. Miller (1):
  Revert "sit: reload iphdr in ipip6_rcv"

 net/ipv6/sit.c | 1 -
 1 file changed, 1 deletion(-)

--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][Xenial][PATCH 1/1] Revert "sit: reload iphdr in ipip6_rcv"

Joseph Salisbury-3
From: "David S. Miller" <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1772775

This reverts commit b699d0035836f6712917a41e7ae58d84359b8ff9.

As per Eric Dumazet, the pskb_may_pull() is a NOP in this
particular case, so the 'iph' reload is unnecessary.

Signed-off-by: David S. Miller <[hidden email]>
(cherry picked from commit f4eb17e1efe538d4da7d574bedb00a8dafcc26b7)
Signed-off-by: Joseph Salisbury <[hidden email]>
---
 net/ipv6/sit.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 51f7c32..e1e7bc0 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -692,7 +692,6 @@ static int ipip6_rcv(struct sk_buff *skb)
 
  if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6)))
  goto out;
- iph = ip_hdr(skb);
 
  err = IP_ECN_decapsulate(iph, skb);
  if (unlikely(err)) {
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [SRU][Xenial][PATCH 1/1] Revert "sit: reload iphdr in ipip6_rcv"

Kleber Souza
On 05/25/18 04:48, Joseph Salisbury wrote:

> From: "David S. Miller" <[hidden email]>
>
> BugLink: http://bugs.launchpad.net/bugs/1772775
>
> This reverts commit b699d0035836f6712917a41e7ae58d84359b8ff9.
>
> As per Eric Dumazet, the pskb_may_pull() is a NOP in this
> particular case, so the 'iph' reload is unnecessary.
>
> Signed-off-by: David S. Miller <[hidden email]>
> (cherry picked from commit f4eb17e1efe538d4da7d574bedb00a8dafcc26b7)
> Signed-off-by: Joseph Salisbury <[hidden email]>

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

> ---
>  net/ipv6/sit.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
> index 51f7c32..e1e7bc0 100644
> --- a/net/ipv6/sit.c
> +++ b/net/ipv6/sit.c
> @@ -692,7 +692,6 @@ static int ipip6_rcv(struct sk_buff *skb)
>  
>   if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6)))
>   goto out;
> - iph = ip_hdr(skb);
>  
>   err = IP_ECN_decapsulate(iph, skb);
>   if (unlikely(err)) {
>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/cmnt: [SRU][Xenial][PATCH 0/1] Revert "sit: reload iphdr in ipip6_rcv"

Stefan Bader-2
In reply to this post by Joseph Salisbury-3
On 25.05.2018 04:48, Joseph Salisbury wrote:

> BugLink: http://bugs.launchpad.net/bugs/1772775
>
> == SRU Justification ==
> A regression was introduce in Xenial linux-image-4.4.0-127-generic.  It
> was found that this regression was introduced by mainline commit
> b699d0035836.  This commit was applied to Xenial via the 4.4.128 upstream stable
> updates.  
>
> Upstream decided to revert this commit in mainline commit f4eb17e1efe5,
> which was added in v4.12-rc5.
>
> == Fix ==
> f4eb17e1efe5 ("Revert "sit: reload iphdr in ipip6_rcv"")
>
> == Regression Potential ==
> Low.  This is a revert request to resolve a regression.  The revert was
> also performed upstream.  
>
> == Test Case ==
> A test kernel was built with this patch and tested by the original bug reporter.
> The bug reporter states the test kernel resolved the bug.
>
> David S. Miller (1):
>   Revert "sit: reload iphdr in ipip6_rcv"
>
>  net/ipv6/sit.c | 1 -
>  1 file changed, 1 deletion(-)
>
Fine with the revert when it was done upstream. Maybe could earn some favour
points when pointing out this to Greg.

Acked-by: Stefan Bader <[hidden email]>



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

APPLIED: [SRU][Xenial][PATCH 0/1] Revert "sit: reload iphdr in ipip6_rcv"

Juerg Haefliger
In reply to this post by Joseph Salisbury-3
Applied to xenial/master-next.

...Juerg

On 05/25/2018 01:48 PM, Joseph Salisbury wrote:

> BugLink: http://bugs.launchpad.net/bugs/1772775
>
> == SRU Justification ==
> A regression was introduce in Xenial linux-image-4.4.0-127-generic.  It
> was found that this regression was introduced by mainline commit
> b699d0035836.  This commit was applied to Xenial via the 4.4.128 upstream stable
> updates.  
>
> Upstream decided to revert this commit in mainline commit f4eb17e1efe5,
> which was added in v4.12-rc5.
>
> == Fix ==
> f4eb17e1efe5 ("Revert "sit: reload iphdr in ipip6_rcv"")
>
> == Regression Potential ==
> Low.  This is a revert request to resolve a regression.  The revert was
> also performed upstream.  
>
> == Test Case ==
> A test kernel was built with this patch and tested by the original bug reporter.
> The bug reporter states the test kernel resolved the bug.
>
> David S. Miller (1):
>   Revert "sit: reload iphdr in ipip6_rcv"
>
>  net/ipv6/sit.c | 1 -
>  1 file changed, 1 deletion(-)
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment