Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1208824/?format=api
{ "id": 1208824, "url": "http://patchwork.ozlabs.org/api/patches/1208824/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191212111307.33566-14-anthony.l.nguyen@intel.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": "<20191212111307.33566-14-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-12-12T11:13:06", "name": "[S35,14/15] ice: Add a boundary check in ice_xsk_umem()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a903a885f2ec0ff38c82b6241637fbb17464c962", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.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/20191212111307.33566-14-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 148167, "url": "http://patchwork.ozlabs.org/api/series/148167/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=148167", "date": "2019-12-12T11:13:03", "name": "[S35,01/15] ice: Support UDP segmentation offload", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/148167/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1208824/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1208824/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.138;\n\thelo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 47Yklh3nHMz9sPT\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 13 Dec 2019 06:44:48 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D210D8844D;\n\tThu, 12 Dec 2019 19:44:46 +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 Xm3G0i0c7zFA; Thu, 12 Dec 2019 19:44:44 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A4E358843E;\n\tThu, 12 Dec 2019 19:44:44 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 35BCB1BF340\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:39 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 20545888CF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:39 +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 SBu+Y8P0a3m6 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:38 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id A6E40888C5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Dec 2019 19:44:37 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t12 Dec 2019 11:44:36 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga001.jf.intel.com with ESMTP; 12 Dec 2019 11:44:35 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.69,306,1571727600\"; d=\"scan'208\";a=\"296698861\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 12 Dec 2019 03:13:06 -0800", "Message-Id": "<20191212111307.33566-14-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191212111307.33566-1-anthony.l.nguyen@intel.com>", "References": "<20191212111307.33566-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S35 14/15] ice: Add a boundary check in\n\tice_xsk_umem()", "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>", "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: Krzysztof Kazimierczak <krzysztof.kazimierczak@intel.com>\n\nIn ice_xsk_umem(), variable qid which is later used as an array index,\nis not validated for a possible boundary exceedance. Because of that,\na calling function might receive an invalid address, which causes\ngeneral protection fault when dereferenced.\n\nTo address this, add a boundary check to see if qid is greater than the\nsize of a UMEM array. Also, don't let user change vsi->num_xsk_umems\njust by trying to setup a second UMEM if its value is already set up\n(i.e. UMEM region has already been allocated for this VSI).\n\nWhile at it, make sure that ring->zca.free pointer is always zeroed out\nif there is no UMEM on a specified ring.\n\nSigned-off-by: Krzysztof Kazimierczak <krzysztof.kazimierczak@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h | 5 +++--\n drivers/net/ethernet/intel/ice/ice_base.c | 1 +\n drivers/net/ethernet/intel/ice/ice_xsk.c | 3 ++-\n 3 files changed, 6 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex b2b1f7b1d932..3dc523fff034 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -476,12 +476,13 @@ static inline void ice_set_ring_xdp(struct ice_ring *ring)\n static inline struct xdp_umem *ice_xsk_umem(struct ice_ring *ring)\n {\n \tstruct xdp_umem **umems = ring->vsi->xsk_umems;\n-\tint qid = ring->q_index;\n+\tu16 qid = ring->q_index;\n \n \tif (ice_ring_is_xdp(ring))\n \t\tqid -= ring->vsi->num_xdp_txq;\n \n-\tif (!umems || !umems[qid] || !ice_is_xdp_ena_vsi(ring->vsi))\n+\tif (qid >= ring->vsi->num_xsk_umems || !umems || !umems[qid] ||\n+\t !ice_is_xdp_ena_vsi(ring->vsi))\n \t\treturn NULL;\n \n \treturn umems[qid];\ndiff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c\nindex d4559d45288f..25f2e0fb3833 100644\n--- a/drivers/net/ethernet/intel/ice/ice_base.c\n+++ b/drivers/net/ethernet/intel/ice/ice_base.c\n@@ -326,6 +326,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t\t\tdev_info(&vsi->back->pdev->dev, \"Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\\n\",\n \t\t\t\t ring->q_index);\n \t\t} else {\n+\t\t\tring->zca.free = NULL;\n \t\t\tif (!xdp_rxq_info_is_reg(&ring->xdp_rxq))\n \t\t\t\txdp_rxq_info_reg(&ring->xdp_rxq,\n \t\t\t\t\t\t ring->netdev,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c\nindex cf9b8b22d24f..be787efaa9d5 100644\n--- a/drivers/net/ethernet/intel/ice/ice_xsk.c\n+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c\n@@ -414,7 +414,8 @@ ice_xsk_umem_enable(struct ice_vsi *vsi, struct xdp_umem *umem, u16 qid)\n \tif (vsi->type != ICE_VSI_PF)\n \t\treturn -EINVAL;\n \n-\tvsi->num_xsk_umems = min_t(u16, vsi->num_rxq, vsi->num_txq);\n+\tif (!vsi->num_xsk_umems)\n+\t\tvsi->num_xsk_umems = min_t(u16, vsi->num_rxq, vsi->num_txq);\n \tif (qid >= vsi->num_xsk_umems)\n \t\treturn -EINVAL;\n \n", "prefixes": [ "S35", "14/15" ] }