Skip to content

Commit

Permalink
net/sched: act_mpls: ensure LSE is pullable before reading it
Browse files Browse the repository at this point in the history
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: 2a2ea50 ("net: sched: add mpls manipulation actions to TC")
Signed-off-by: Davide Caratti <[email protected]>
Acked-by: Guillaume Nault <[email protected]>
Link: https://lore.kernel.org/r/3243506cba43d14858f3bd21ee0994160e44d64a.1606987058.git.dcaratti@redhat.com
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
dcaratti authored and kuba-moo committed Dec 3, 2020
1 parent 43c1360 commit 9608fa6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions net/sched/act_mpls.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9608fa6

Please sign in to comment.