Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1118757/?format=api
{ "id": 1118757, "url": "http://patchwork.ozlabs.org/api/patches/1118757/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190619143044.10259-1-colin.king@canonical.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20190619143044.10259-1-colin.king@canonical.com>", "list_archive_url": null, "date": "2019-06-19T14:30:44", "name": "[net-next] iavf: fix dereference of null rx_buffer pointer", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a457567da5d204c3bbe0ffc597f094453bbfe933", "submitter": { "id": 2900, "url": "http://patchwork.ozlabs.org/api/people/2900/?format=api", "name": "Colin Ian King", "email": "colin.king@canonical.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190619143044.10259-1-colin.king@canonical.com/mbox/", "series": [ { "id": 114839, "url": "http://patchwork.ozlabs.org/api/series/114839/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=114839", "date": "2019-06-19T14:30:44", "name": "[net-next] iavf: fix dereference of null rx_buffer pointer", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/114839/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1118757/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1118757/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dmarc=fail (p=none dis=none)\n\theader.from=canonical.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 45TS6r27lLz9s7h\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 20 Jun 2019 00:30:59 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5D5FA87B21;\n\tWed, 19 Jun 2019 14:30:57 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id fdu1Gdr+Uwlm; Wed, 19 Jun 2019 14:30:52 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0ADFC87B0F;\n\tWed, 19 Jun 2019 14:30:52 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 16AB51BF3BA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 19 Jun 2019 14:30:51 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 128E8811DD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 19 Jun 2019 14:30:51 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id eLESM9EuHbJW for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 19 Jun 2019 14:30:50 +0000 (UTC)", "from youngberry.canonical.com (youngberry.canonical.com\n\t[91.189.89.112])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 16D01811D3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 19 Jun 2019 14:30:50 +0000 (UTC)", "from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost)\n\tby youngberry.canonical.com with esmtpsa\n\t(TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.76) (envelope-from <colin.king@canonical.com>)\n\tid 1hdbbp-0005sO-5S; Wed, 19 Jun 2019 14:30:45 +0000" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "From": "Colin King <colin.king@canonical.com>", "To": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>,\n\t\"David S . Miller\" <davem@davemloft.net>,\n\tintel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org", "Date": "Wed, 19 Jun 2019 15:30:44 +0100", "Message-Id": "<20190619143044.10259-1-colin.king@canonical.com>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH][net-next] iavf: fix dereference of null\n\trx_buffer pointer", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Colin Ian King <colin.king@canonical.com>\n\nA recent commit efa14c3985828d (\"iavf: allow null RX descriptors\") added\na null pointer sanity check on rx_buffer, however, rx_buffer is being\ndereferenced before that check, which implies a null pointer dereference\nbug can potentially occur. Fix this by only dereferencing rx_buffer\nuntil after the null pointer check.\n\nAddresses-Coverity: (\"Dereference before null check\")\nSigned-off-by: Colin Ian King <colin.king@canonical.com>\n---\n drivers/net/ethernet/intel/iavf/iavf_txrx.c | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\nindex 1cde1601bc32..0cca1b589b56 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n@@ -1296,7 +1296,7 @@ static struct sk_buff *iavf_construct_skb(struct iavf_ring *rx_ring,\n \t\t\t\t\t struct iavf_rx_buffer *rx_buffer,\n \t\t\t\t\t unsigned int size)\n {\n-\tvoid *va = page_address(rx_buffer->page) + rx_buffer->page_offset;\n+\tvoid *va;\n #if (PAGE_SIZE < 8192)\n \tunsigned int truesize = iavf_rx_pg_size(rx_ring) / 2;\n #else\n@@ -1308,6 +1308,7 @@ static struct sk_buff *iavf_construct_skb(struct iavf_ring *rx_ring,\n \tif (!rx_buffer)\n \t\treturn NULL;\n \t/* prefetch first cache line of first page */\n+\tva = page_address(rx_buffer->page) + rx_buffer->page_offset;\n \tprefetch(va);\n #if L1_CACHE_BYTES < 128\n \tprefetch(va + L1_CACHE_BYTES);\n@@ -1362,7 +1363,7 @@ static struct sk_buff *iavf_build_skb(struct iavf_ring *rx_ring,\n \t\t\t\t struct iavf_rx_buffer *rx_buffer,\n \t\t\t\t unsigned int size)\n {\n-\tvoid *va = page_address(rx_buffer->page) + rx_buffer->page_offset;\n+\tvoid *va;\n #if (PAGE_SIZE < 8192)\n \tunsigned int truesize = iavf_rx_pg_size(rx_ring) / 2;\n #else\n@@ -1374,6 +1375,7 @@ static struct sk_buff *iavf_build_skb(struct iavf_ring *rx_ring,\n \tif (!rx_buffer)\n \t\treturn NULL;\n \t/* prefetch first cache line of first page */\n+\tva = page_address(rx_buffer->page) + rx_buffer->page_offset;\n \tprefetch(va);\n #if L1_CACHE_BYTES < 128\n \tprefetch(va + L1_CACHE_BYTES);\n", "prefixes": [ "net-next" ] }