From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 3A46AA0679 for ; Tue, 30 Apr 2019 12:42:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9D3485F21; Tue, 30 Apr 2019 12:42:12 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id EB21C1E25; Tue, 30 Apr 2019 12:42:10 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Apr 2019 03:42:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,413,1549958400"; d="scan'208";a="295753537" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.33]) ([10.237.221.33]) by orsmga004.jf.intel.com with ESMTP; 30 Apr 2019 03:42:08 -0700 To: "Burakov, Anatoly" , Herakliusz Lipiec , Keith Wiles Cc: dev@dpdk.org, rasland@mellanox.com, stable@dpdk.org References: <20190425164700.30948-1-herakliusz.lipiec@intel.com> <20190425171702.933-1-herakliusz.lipiec@intel.com> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= mQINBFXZCFABEADCujshBOAaqPZpwShdkzkyGpJ15lmxiSr3jVMqOtQS/sB3FYLT0/d3+bvy qbL9YnlbPyRvZfnP3pXiKwkRoR1RJwEo2BOf6hxdzTmLRtGtwWzI9MwrUPj6n/ldiD58VAGQ +iR1I/z9UBUN/ZMksElA2D7Jgg7vZ78iKwNnd+vLBD6I61kVrZ45Vjo3r+pPOByUBXOUlxp9 GWEKKIrJ4eogqkVNSixN16VYK7xR+5OUkBYUO+sE6etSxCr7BahMPKxH+XPlZZjKrxciaWQb +dElz3Ab4Opl+ZT/bK2huX+W+NJBEBVzjTkhjSTjcyRdxvS1gwWRuXqAml/sh+KQjPV1PPHF YK5LcqLkle+OKTCa82OvUb7cr+ALxATIZXQkgmn+zFT8UzSS3aiBBohg3BtbTIWy51jNlYdy ezUZ4UxKSsFuUTPt+JjHQBvF7WKbmNGS3fCid5Iag4tWOfZoqiCNzxApkVugltxoc6rG2TyX CmI2rP0mQ0GOsGXA3+3c1MCdQFzdIn/5tLBZyKy4F54UFo35eOX8/g7OaE+xrgY/4bZjpxC1 1pd66AAtKb3aNXpHvIfkVV6NYloo52H+FUE5ZDPNCGD0/btFGPWmWRmkPybzColTy7fmPaGz cBcEEqHK4T0aY4UJmE7Ylvg255Kz7s6wGZe6IR3N0cKNv++O7QARAQABtCVGZXJydWggWWln aXQgPGZlcnJ1aC55aWdpdEBpbnRlbC5jb20+iQJVBBMBAgA/AhsDBgsJCAcDAgYVCAIJCgsE FgIDAQIeAQIXgBYhBNI2U4dCLsKE45mBx/kz60PfE2EfBQJbughWBQkHwjOGAAoJEPkz60Pf E2Eft84QAIbKWqhgqRfoiw/BbXbA1+qm2o4UgkCRQ0yJgt9QsnbpOmPKydHH0ixCliNz1J8e mRXCkMini1bTpnzp7spOjQGLeAFkNFz6BMq8YF2mVWbGEDE9WgnAxZdi0eLY7ZQnHbE6AxKL SXmpe9INb6z3ztseFt7mqje/W/6DWYIMnH3Yz9KzxujFWDcq8UCAvPkxVQXLTMpauhFgYeEx Nub5HbvhxTfUkapLwRQsSd/HbywzqZ3s/bbYMjj5JO3tgMiM9g9HOjv1G2f1dQjHi5YQiTZl 1eIIqQ3pTic6ROaiZqNmQFXPsoOOFfXF8nN2zg8kl/sSdoXWHhama5hbwwtl1vdaygQYlmdK H2ueiFh/UvT3WG3waNv2eZiEbHV8Rk52Xyn2w1G90lV0fYC6Ket1Xjoch7kjwbx793Kz/RfQ rmBY8/S4DTGn3oq3dMdQY+b6+7VMUeLMMh2CXYO9ErkOq+qNTD1IY+cBAkXnaDbQfz0zbste ZGWH74FAZ9nCpDOqbRTrBL42aMGhfOWEyeA1x7+hl6JZfabBWAuf4nnCXuorKHzBXTrf7u7p fXsKQClWRW77PF1VmzrtKNVSytQAmlCWApQIw20AarFipXmVdIjHmJPU611WoyxZPb4JTOxx 5cv9B+nr/RIB+v5dcStyHCCwO1be7nBDdCgd4F6kTQPLuQINBFfWTL4BEACnNA29e8TarUsB L5n6eLZHXcFvVwNLVlirWOClHXf44o2KnN3ww+eBEmKVfEFo9MSuGDNHS8Zw1NiGMYxLIUgd U6gGrVVs/VrQWL82pbMk6jCj98N+BXIri+6K1z+AImz7ax7iF1kDgRAnFWU0znWWBgM2mM8Y gDjcxfXk4sCKnvf6Gjo08Ey5zmqx7dekAKU2EEp8Q1EJY3jbymLdZWRP4AFFMTS1rGMk0/tt v71NBg1GobCcbNfn9chK/jhqxYhAJqq86RdJQkt3/9x1U1Oq0vXCt4JVVHmkxePtUiuWTTt+ aYlUAsKYZsWvncExvw77x2ArYDmaK0yfjh37wp0lY7DOJHFxoyT8tyWZlLci/VMRG2Ja33xj 0CN4C1yBg+QDeV3QFxQo42iA/ykdXPUR3ezmsND3XKvVLTC4DNb3V/EZQ7jBj64+bEK0VW4G B31VP00ApNQvSoczsIOAKdk97RNbpmPw6q10ILIB+9T1xbnFYzshzGF17oC0/GENIHATx8vZ masOZoDiOZQpeneLgnFE9JfzhLTxv6wNZcc/HLXRQVTkDsQr8ERtkAoHCf1E5+b5Yr7pfnE4 YuhET746o25S53ELUYPIs49qoJsEJL34/oexMfPGyPIlrbufiNyty5jc/1MRwUlhJlJ5IOHy ZUa+6CLR7GdImusFkPJUJwARAQABiQI8BBgBAgAmAhsMFiEE0jZTh0IuwoTjmYHH+TPrQ98T YR8FAlu6CHAFCQXE7zIACgkQ+TPrQ98TYR9nXxAAqNBgkYNyGuWUuy0GwDQCbu3iiMyH1+D7 llafPcK4NYy1Z4AYuVwC9nmLaoj+ozdqS3ncRo57ncRsKEJC46nDJJZYZ5LSJVn63Y3NBF86 lxQAgjj2oyZEwaLKtKbAFsXL43jv1pUGgSvWwYtDwHITXXFQto9rZEuUDRFSx4sg9OR+Q6/6 LY+nQQ3OdHlBkflzYMPcWgDcvcTAO6yasLEUf7UcYoSWTyMYjLB4QuNlXzTswzGVMssJF/vo V8lD1eqqaSUWG3STF6GVLQOr1NLvN5+kUBiEStHFxBpgSCvYY9sNV8FS6N24CAWMBl+10W+D 2h1yiiP5dOdPcBDYKsgqDD91/sP0WdyMJkwdQJtD49f9f+lYloxHnSAxMleOpyscg1pldw+i mPaUY1bmIknLhhkqfMmjywQOXpac5LRMibAAYkcB8v7y3kwELnt8mhqqZy6LUsqcWygNbH/W K3GGt5tRpeIXeJ25x8gg5EBQ0Jnvp/IbBYQfPLtXH0Myq2QuAhk/1q2yEIbVjS+7iowEZNyE 56K63WBJxsJPB2mvmLgn98GqB4G6GufP1ndS0XDti/2K0o8rep9xoY/JDGi0n0L0tk9BHyoP Y7kaEpu7UyY3nVdRLe5H1/MnFG8hdJ97WqnPS0buYZlrbTV0nRFL/NI2VABl18vEEXvNQiO+ vM8= Message-ID: <2d098092-1eed-dbad-ccfe-b0d3bb2fddfb@intel.com> Date: Tue, 30 Apr 2019 11:42:07 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH v2] net/tap: fix potential buffer overrun X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Message-ID: <20190430104207.ZicGxzFdSlNqp56Rg4NuUkwp-ZKehUfRSkQizHffwWs@z> On 4/29/2019 3:02 PM, Burakov, Anatoly wrote: > On 29-Apr-19 2:53 PM, Ferruh Yigit wrote: >> On 4/25/2019 6:17 PM, Herakliusz Lipiec wrote: >>> When secondary to primary process synchronization occours >>> there is no check for number of fds which could cause buffer overrun. >>> >>> Bugzilla ID: 252 >>> Fixes: c9aa56edec8e ("net/tap: access primary process queues from secondary") >>> Cc: rasland@mellanox.com >>> Cc: stable@dpdk.org >>> >>> Signed-off-by: Herakliusz Lipiec >>> --- >>> drivers/net/tap/rte_eth_tap.c | 13 +++++++++++-- >>> 1 file changed, 11 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c >>> index e9fda8cf6..4a2ef5ce7 100644 >>> --- a/drivers/net/tap/rte_eth_tap.c >>> +++ b/drivers/net/tap/rte_eth_tap.c >>> @@ -2111,6 +2111,10 @@ tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev) >>> TAP_LOG(DEBUG, "Received IPC reply for %s", reply_param->port_name); >>> >>> /* Attach the queues from received file descriptors */ >>> + if (reply_param->rxq_count + reply_param->txq_count != reply->num_fds) { >>> + TAP_LOG(ERR, "Unexpected number of fds received"); >>> + return -1; >>> + } >> >> Is there a way this can happen? If not I suggest remove the check. > > Normally no, but theoretically this can trigger a buffer overrun if not > checked. After all, something could either fail on the other side, or > someone could send a fake message :) This data is coming from an > external source, so we need to sanity-check it. Both sender and receiver are in the same driver, primary and secondary application paths, there is no communication with external source, and I don't see any code path that will cause this failure. After above said, this is just an additional reasonable check and not in the data path, so having this won't hurt, I don't object to have it. > >> >>> dev->data->nb_rx_queues = reply_param->rxq_count; >>> dev->data->nb_tx_queues = reply_param->txq_count; >>> fd_iterator = 0; >>> @@ -2151,12 +2155,16 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer) >>> /* Fill file descriptors for all queues */ >>> reply.num_fds = 0; >>> reply_param->rxq_count = 0; >>> + if (dev->data->nb_rx_queues + dev->data->nb_tx_queues > >>> + RTE_MP_MAX_FD_NUM){ >>> + TAP_LOG(ERR, "Number of rx/tx queues exceeds max number of fds"); >>> + return -1; >>> + } >> >> +1 for the check. >> But what it does when return "-1", not send a message at all? If so would it be >> better to send and error message back instead of waiting the receiver to timeout? > > There will be a different patch fixing this specific issue. Probably > this patch would need to be rebased on top of that. +1 to fix this issue but I assume it won't be for this release, so can get this patch now and this part can be updated with mentioned patch. > >> >>> for (queue = 0; queue < dev->data->nb_rx_queues; queue++) { >>> reply.fds[reply.num_fds++] = process_private->rxq_fds[queue]; >>> reply_param->rxq_count++; >>> } >>> RTE_ASSERT(reply_param->rxq_count == dev->data->nb_rx_queues); >>> - RTE_ASSERT(reply_param->txq_count == dev->data->nb_tx_queues); >>> RTE_ASSERT(reply.num_fds <= RTE_MP_MAX_FD_NUM); >> >> Since there is dynamic check above for "RTE_MP_MAX_FD_NUM", we can remove this >> assert I think. >> >>> >>> reply_param->txq_count = 0; >>> @@ -2164,7 +2172,8 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer) >>> reply.fds[reply.num_fds++] = process_private->txq_fds[queue]; >>> reply_param->txq_count++; >>> } >>> - >>> + RTE_ASSERT(reply_param->txq_count == dev->data->nb_tx_queues); >>> + RTE_ASSERT(reply.num_fds <= RTE_MP_MAX_FD_NUM); >> >> Same for this assert, we can remove it. >> And as syntax, please keep the empty line before next block. >> >>> /* Send reply */ >>> strlcpy(reply.name, request->name, sizeof(reply.name)); >>> strlcpy(reply_param->port_name, request_param->port_name, >>> >> >> > >