Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1376063/?format=api
{ "id": 1376063, "url": "http://patchwork.ozlabs.org/api/patches/1376063/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/71ec98d51cc4aab7615061336fb1498ad16cda30.1601667845.git.gnault@redhat.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<71ec98d51cc4aab7615061336fb1498ad16cda30.1601667845.git.gnault@redhat.com>", "list_archive_url": null, "date": "2020-10-02T19:53:08", "name": "[net] net/core: check length before updating Ethertype in skb_mpls_{push,pop}", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "318652f6ddff9899da1a8a762c005ec939f81010", "submitter": { "id": 75813, "url": "http://patchwork.ozlabs.org/api/people/75813/?format=api", "name": "Guillaume Nault", "email": "gnault@redhat.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/71ec98d51cc4aab7615061336fb1498ad16cda30.1601667845.git.gnault@redhat.com/mbox/", "series": [ { "id": 205714, "url": "http://patchwork.ozlabs.org/api/series/205714/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=205714", "date": "2020-10-02T19:53:08", "name": "[net] net/core: check length before updating Ethertype in skb_mpls_{push,pop}", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/205714/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1376063/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1376063/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming-netdev@ozlabs.org", "Delivered-To": "patchwork-incoming-netdev@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=23.128.96.18; helo=vger.kernel.org;\n envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=redhat.com", "ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Oq8ICsWc;\n\tdkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 4C30zJ4qBDz9sSf\n\tfor <patchwork-incoming-netdev@ozlabs.org>;\n Sat, 3 Oct 2020 05:53:16 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S1725794AbgJBTxP (ORCPT\n <rfc822;patchwork-incoming-netdev@ozlabs.org>);\n Fri, 2 Oct 2020 15:53:15 -0400", "from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29767 \"EHLO\n us-smtp-delivery-124.mimecast.com\" rhost-flags-OK-OK-OK-OK)\n by vger.kernel.org with ESMTP id S1725283AbgJBTxP (ORCPT\n <rfc822;netdev@vger.kernel.org>); Fri, 2 Oct 2020 15:53:15 -0400", "from mail-wm1-f70.google.com (mail-wm1-f70.google.com\n [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-235-0KknLvu1MFe6HjzobF88zg-1; Fri, 02 Oct 2020 15:53:12 -0400", "by mail-wm1-f70.google.com with SMTP id b20so910473wmj.1\n for <netdev@vger.kernel.org>; Fri, 02 Oct 2020 12:53:12 -0700 (PDT)", "from pc-2.home\n (2a01cb058d4f8400c9f0d639f7c74c26.ipv6.abo.wanadoo.fr.\n [2a01:cb05:8d4f:8400:c9f0:d639:f7c7:4c26])\n by smtp.gmail.com with ESMTPSA id\n z67sm2907107wme.41.2020.10.02.12.53.10\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 02 Oct 2020 12:53:10 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1601668394;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type;\n bh=3K0Pxu+gC6syY9syny9BArfDKK8IA+0REr3HjAGSJuA=;\n b=Oq8ICsWcerI75eV64EB8fDxTzIg/sdyfKmDOVcbruPJPHgDB04y30yEJ84bktozxPsYvMl\n G1KTXkKJSa1z4RK2RPwA+MIwEyku4tpnYx0NkdPuqJ98cRaAibi8AIYX6EhMgZ/ncfGElS\n Ctwvzw9DHAhGgm5wCDLPofGqKtWAcMs=", "X-MC-Unique": "0KknLvu1MFe6HjzobF88zg-1", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version\n :content-disposition;\n bh=3K0Pxu+gC6syY9syny9BArfDKK8IA+0REr3HjAGSJuA=;\n b=pE8rCHoniDOuFOdeDQf9CRX1/KAtdHS9EAbAQR6GtH2pz8hMTR6mmgW9rYeKHaVLqD\n mNiEHyn+y6BcH5fA/UCZAcq/7wDv6BGkwqMm902dAlX6L39wK43xQWANHOS0Mr9d/Afu\n pUb3SjTElli2Q2qc2k6h+ZgX9WWkvMB+k58MJZrFnmUsMZu+twESdhFeQq9qudt+H3yM\n XB4k2dj7trdt4y1UHl6PCABrxgQGPudE21r2YtgNvl7ucS0fXsogYP8kOXySgfVbk63W\n c2zeDsGzn4Ns2HwQdutkMkR2BKPkWCEAHeA6+Zmtjx6lHOaoNjnDGEa3kCrr1X2fpHyU\n d0yw==", "X-Gm-Message-State": "AOAM531bt4FebyO1hj+OCULwQllruPCIHQxCPAPKdqVmjYvLj67vluHE\n vMU0EyPWNCiiSmSsOacfoAsJDdZmJ5CelcGETB19I/yllwIUz1KO9mTc2S22TFd0UEgigIV+08p\n Yttz3sedaHVYhuTTr", "X-Received": [ "by 2002:a05:600c:20c:: with SMTP id\n 12mr4687312wmi.40.1601668391302;\n Fri, 02 Oct 2020 12:53:11 -0700 (PDT)", "by 2002:a05:600c:20c:: with SMTP id\n 12mr4687299wmi.40.1601668391090;\n Fri, 02 Oct 2020 12:53:11 -0700 (PDT)" ], "X-Google-Smtp-Source": "\n ABdhPJyU7xq/zIJOBm5rQfh4PzTyUVQTnUO/LhIQ5x/O7xVdLxit6qX51ayaTDuDje3fg5ZvZSrjPQ==", "Date": "Fri, 2 Oct 2020 21:53:08 +0200", "From": "Guillaume Nault <gnault@redhat.com>", "To": "David Miller <davem@davemloft.net>,\n Jakub Kicinski <kuba@kernel.org>", "Cc": "netdev@vger.kernel.org,\n Martin Varghese <martin.varghese@nokia.com>,\n Davide Caratti <dcaratti@redhat.com>", "Subject": "[PATCH net] net/core: check length before updating Ethertype in\n skb_mpls_{push,pop}", "Message-ID": "\n <71ec98d51cc4aab7615061336fb1498ad16cda30.1601667845.git.gnault@redhat.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=us-ascii", "Content-Disposition": "inline", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Openvswitch allows to drop a packet's Ethernet header, therefore\nskb_mpls_push() and skb_mpls_pop() might be called with ethernet=true\nand mac_len=0. In that case the pointer passed to skb_mod_eth_type()\ndoesn't point to an Ethernet header and the new Ethertype is written at\nunexpected locations.\n\nFix this by verifying that mac_len is big enough to contain an Ethernet\nheader.\n\nFixes: fa4e0f8855fc (\"net/sched: fix corrupted L2 header with MPLS 'push' and 'pop' actions\")\nSigned-off-by: Guillaume Nault <gnault@redhat.com>\n---\nNotes:\n - Found by code inspection.\n - Using commit fa4e0f8855fc for the Fixes tag because mac_len is\n needed for the test. The problem probably exists since openvswitch\n can pop the Ethernet header though.\n\n net/core/skbuff.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)", "diff": "diff --git a/net/core/skbuff.c b/net/core/skbuff.c\nindex 6faf73d6a0f7..2b48cb0cc684 100644\n--- a/net/core/skbuff.c\n+++ b/net/core/skbuff.c\n@@ -5622,7 +5622,7 @@ int skb_mpls_push(struct sk_buff *skb, __be32 mpls_lse, __be16 mpls_proto,\n \tlse->label_stack_entry = mpls_lse;\n \tskb_postpush_rcsum(skb, lse, MPLS_HLEN);\n \n-\tif (ethernet)\n+\tif (ethernet && mac_len >= ETH_HLEN)\n \t\tskb_mod_eth_type(skb, eth_hdr(skb), mpls_proto);\n \tskb->protocol = mpls_proto;\n \n@@ -5662,7 +5662,7 @@ int skb_mpls_pop(struct sk_buff *skb, __be16 next_proto, int mac_len,\n \tskb_reset_mac_header(skb);\n \tskb_set_network_header(skb, mac_len);\n \n-\tif (ethernet) {\n+\tif (ethernet && mac_len >= ETH_HLEN) {\n \t\tstruct ethhdr *hdr;\n \n \t\t/* use mpls_hdr() to get ethertype to account for VLANs. */\n", "prefixes": [ "net" ] }