[PATCH net v2] net/sched: act_mpls: ensure LSE is pullable before reading it

[PATCH net v2] net/sched: act_mpls: ensure LSE is pullable before reading it

[Davide Caratti]

when 'act_mpls' is used to mangle the LSE, the current value is read from
the packet dereferencing 4 bytes at mpls_hdr(): ensure that the label is
contained in the skb "linear" area.

Found by code inspection.

v2:
 - use MPLS_HLEN instead of sizeof(new_lse), thanks to Jakub Kicinski

Fixes: 2a2ea50870ba ("net: sched: add mpls manipulation actions to TC")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
---
 net/sched/act_mpls.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c
index 5c7456e5b5cf..d1486ea496a2 100644
--- a/net/sched/act_mpls.c
+++ b/net/sched/act_mpls.c
@@ -105,6 +105,9 @@ static int tcf_mpls_act(struct sk_buff *skb, const struct tc_action *a,
 			goto drop;
 		break;
 	case TCA_MPLS_ACT_MODIFY:
+		if (!pskb_may_pull(skb,
+				   skb_network_offset(skb) + MPLS_HLEN))
+			goto drop;
 		new_lse = tcf_mpls_get_lse(mpls_hdr(skb), p, false);
 		if (skb_mpls_update_lse(skb, new_lse))
 			goto drop;
-- 
2.28.0

Re: [PATCH net v2] net/sched: act_mpls: ensure LSE is pullable before reading it

[Guillaume Nault]

On Thu, Dec 03, 2020 at 10:37:52AM +0100, Davide Caratti wrote:
> when 'act_mpls' is used to mangle the LSE, the current value is read from
> the packet dereferencing 4 bytes at mpls_hdr(): ensure that the label is
> contained in the skb "linear" area.

Acked-by: Guillaume Nault <gnault@redhat.com>

Re: [PATCH net v2] net/sched: act_mpls: ensure LSE is pullable before reading it

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Thu,  3 Dec 2020 10:37:52 +0100 you wrote:
> when 'act_mpls' is used to mangle the LSE, the current value is read from
> the packet dereferencing 4 bytes at mpls_hdr(): ensure that the label is
> contained in the skb "linear" area.
> 
> Found by code inspection.
> 
> v2:
>  - use MPLS_HLEN instead of sizeof(new_lse), thanks to Jakub Kicinski
> 
> [...]

Here is the summary with links:
  - [net,v2] net/sched: act_mpls: ensure LSE is pullable before reading it
    https://git.kernel.org/netdev/net/c/9608fa653059

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html