| Message ID | 3243506cba43d14858f3bd21ee0994160e44d64a.1606987058.git.dcaratti@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9608fa653059c3f72faab0c148ac8773c46e7314 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] net/sched: act_mpls: ensure LSE is pullable before reading it | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
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>
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
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;
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(+)