From patchwork Mon Jul 10 17:07:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129422 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3259642E3C; Mon, 10 Jul 2023 19:08:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FD38410F1; Mon, 10 Jul 2023 19:08:06 +0200 (CEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mails.dpdk.org (Postfix) with ESMTP id BBC8A40150 for ; Mon, 10 Jul 2023 19:08:04 +0200 (CEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6686ef86110so2457247b3a.2 for ; Mon, 10 Jul 2023 10:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1689008884; x=1691600884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CDcDfS1cuA/rU7hVWQqOWMx/1ze1JUu6dCKBA1lV2cw=; b=3NxXMKcfO3YWBQos5UXq57b9/KqZaib8CoNyJoLjhzz/C2V06ct0FIbw89h7m0jcBd W/7EXQXLQIW0xnejj+RzjMmCAtWIsbLwh2T2zMbossH7f/0jSLRW9AQaYDa8xG/C5Vwv ozh9Bq0IKxseVxQ4E1HfdM6izRoAKvghTfGiDKAuVbK9lqeYAM2IjMt16tzuxx4gHwJU Imd+kTSQnZQX6dAgz1wIqHmmZ9n8byu7CSWD+vyl8ayXEr+62q99BFMkKrrRlkzCVbrz QdhHcO6jZxeBlid9LMoRrYax6iuIcsc8w2QxhISRA6VZlzQTKsjXq/mi7p62QngUkHQa XxHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689008884; x=1691600884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CDcDfS1cuA/rU7hVWQqOWMx/1ze1JUu6dCKBA1lV2cw=; b=Z+USpqmyLn1oUBXOFljewKgnGi2fLh8IbTOvsENgG0TXsMFunljlwq6737StufLZ5L RAMJ8DW+GNSXwWX2ngMjqaIt6eY6RzQ3QPYVp5TsLg0ixcax6c5PZE8kjzSRci4OFycY hYB0m8H1o/BEYPlOyZqCznLJKXUN+ji/+GMPw8nxbwAwAGM1PItDDQ2Xi9LEmDj+RLc7 Ta5JA4gUl8rL0wm6WsoFSyTleQSqqK3wwNZj9OpTIAvEOibmiLGRNeQwPZd5vbloGaQN XSewld+odShbUPAy8g5Jupbl15CNuwtfueSlse3HTxD95wKhjKAmF0Z04OoEn03PwluL Jrxw== X-Gm-Message-State: ABy/qLZKer+cXSPrY2DCEpfUAm32yLRoWPAkFCxjTTTWf327MIaJyvib aMbEQ1LQAewwsNlZHSlYCtkz07U8FiMaUJFoOghJPQ== X-Google-Smtp-Source: APBJJlHz6jm02XIMJCXBhHIdB18t+Wh00F9vdOxddA5FM+4Zx5t9fUujvcT+J4OKVoC1+sNh5QZyAA== X-Received: by 2002:a05:6a00:21d5:b0:668:94a2:2ec7 with SMTP id t21-20020a056a0021d500b0066894a22ec7mr12782929pfj.25.1689008883653; Mon, 10 Jul 2023 10:08:03 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b00682ed27f99dsm51799pfh.46.2023.07.10.10.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 10:08:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Thomas Monjalon Subject: [PATCH v4 1/5] mailmap: add Sinan Date: Mon, 10 Jul 2023 10:07:56 -0700 Message-Id: <20230710170800.12478-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230710170800.12478-1-stephen@networkplumber.org> References: <20230120044140.95975-1-okaya@kernel.org> <20230710170800.12478-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Patches get flagged as in error if mailmap missing. Signed-off-by: Stephen Hemminger --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index d200f363394d..91557940e3d9 100644 --- a/.mailmap +++ b/.mailmap @@ -1285,6 +1285,7 @@ Simon Ellmann Simon Horman Simon Kagstrom Simon Kuenzer +Sinan Kaya Siobhan Butler Sirshak Das Sivaprasad Tummala From patchwork Mon Jul 10 17:07:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129423 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DDF6A42E3C; Mon, 10 Jul 2023 19:08:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66A9C40EE4; Mon, 10 Jul 2023 19:08:08 +0200 (CEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mails.dpdk.org (Postfix) with ESMTP id E5B5340EE4 for ; Mon, 10 Jul 2023 19:08:05 +0200 (CEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6686708c986so4182013b3a.0 for ; Mon, 10 Jul 2023 10:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1689008885; x=1691600885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KbFQUlYs6HQbdGpJ+pYHgzZS0d5/E2CJRCb/AY/vnpU=; b=y/c65iVFfeOXu3hBRPlHJ4WPXaa59Qvzmz3r4CLlkqS8OJHiQHjgOeiC2fbzlc3qJp i1ZvEgo63sIGHDCLbaon40vZTSgk7cX3OlKUpTEx0APhjj7Fv7wlpMBe2G4ErSzPOGfa xzV+W3hm+fSsYzX2VPwcNX19VAdPzRCEjCYiGPfY0yc358bzdVzRXeDUQsRPgU/VE5BV r4upjEklHy68sYDM87taWzK0kURAoTqqIXVx4d9AbFQ/L3LaLlWODPK2EqByE7gZYRNx aKou9zoeo9d7KWGR5coUEgKGSshJDGunWhmmWpaEWPwFXeBrecyXS6ixVm4wdnTqS7SK lVKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689008885; x=1691600885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KbFQUlYs6HQbdGpJ+pYHgzZS0d5/E2CJRCb/AY/vnpU=; b=DNLSpaGFSngCKcvqlph0VFYFWXlIvceX5m2Ywi10Q2yFQ5TDKOaE1KcR/FO6/kcW4T fqlmNVDE7lIqQPuMn2MHRHWHfNW9hAqfHj8bCQCdXEiVx3RNn6JbqlA6WDGIWldd18zg yNo7/9JONC7EXnLhYE9RlVDHMrS8o6MSBu0JRFf+KaHfw6VaKZ/3pBbREyGPrUztF3+N 4N2v0hrnyGV467MqUm3vHZ5UnZS78D/gd/V4g6AFOphKceFx9umPsBbW0C9FYy5OlJrd C2Zqz8GRED9dJfX75qByOhHcUT7/z6Py2f5mkqQGuaRIir9HW9YYQfZgeDAvhKMslqT+ zH6g== X-Gm-Message-State: ABy/qLYg/SY6jMTqt7xggaIWTSxBWtLr+8aWgPSqGmT59Yiw004JH+GF 8PK2Gq+M5oDdlZ5z8VfGZofM0LvnZ7oQUWPDUOsgEw== X-Google-Smtp-Source: APBJJlHeuRilX+IpRTQ5P5RHPOrEVPtDcPkOg23ZhDphegUgbt8A1uW+n/lnraCQdHZJG6ACthLCFw== X-Received: by 2002:a05:6a00:22cc:b0:666:d78c:33ab with SMTP id f12-20020a056a0022cc00b00666d78c33abmr17844905pfj.21.1689008884848; Mon, 10 Jul 2023 10:08:04 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b00682ed27f99dsm51799pfh.46.2023.07.10.10.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 10:08:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Sinan Kaya , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Subject: [PATCH v4 2/5] ethdev: check return result of rte_eth_dev_info_get Date: Mon, 10 Jul 2023 10:07:57 -0700 Message-Id: <20230710170800.12478-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230710170800.12478-1-stephen@networkplumber.org> References: <20230120044140.95975-1-okaya@kernel.org> <20230710170800.12478-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Sinan Kaya rte_class_eth: eth_mac_cmp: The status of this call to rte_eth_dev_info_get is not checked, potentially leaving dev_info uninitialized. Signed-off-by: Sinan Kaya Signed-off-by: Stephen Hemminger Reviewed-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- lib/ethdev/rte_class_eth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c index b61dae849dce..05c100efbba3 100644 --- a/lib/ethdev/rte_class_eth.c +++ b/lib/ethdev/rte_class_eth.c @@ -50,8 +50,10 @@ eth_mac_cmp(const char *key __rte_unused, if (rte_ether_unformat_addr(value, &mac) < 0) return -1; /* invalid devargs value */ + if (rte_eth_dev_info_get(data->port_id, &dev_info) < 0) + return -1; + /* Return 0 if devargs MAC is matching one of the device MACs. */ - rte_eth_dev_info_get(data->port_id, &dev_info); for (index = 0; index < dev_info.max_mac_addrs; index++) if (rte_is_same_ether_addr(&mac, &data->mac_addrs[index])) return 0; From patchwork Mon Jul 10 17:07:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129424 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F06E242E3C; Mon, 10 Jul 2023 19:08:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8620142B8E; Mon, 10 Jul 2023 19:08:09 +0200 (CEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id E088941611 for ; Mon, 10 Jul 2023 19:08:06 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-666e6541c98so4176796b3a.2 for ; Mon, 10 Jul 2023 10:08:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1689008886; x=1691600886; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HadCKv8ON/rlBz7y5pzzsqsNZoiFEyBsmZEp/1o1ERk=; b=DfxirwkoSjFq1kGP8vWv5a9oThzbFnQq5xG5bExyzTJcN6UClkS00JVvPd44ErZZPp TEFCKiEh1RGp4SmGtBRkvrUB/1Tu/i07jbatGOz/GO6XP73dPvIvyDHQn1wxYv2LNDCy x4QrU4MNI3pwLawo4ruA/vHluHZgASTLrD0QTpPgzTm9BQJ0e3077Fp4NWDKfi1QFdGS jdxAZFAQZXtTIYLcTzwhY1I28O+KW7xUx+FylAoLdRkigwUrXFfAotQHrMfTj22gmo5K PIe21DUtYM5LDk+TY6gpB9q7d3ouGzOBRNUvkvJZ4CBwV+ks1+Yh/mdbFiNNvDJsvJp5 Sniw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689008886; x=1691600886; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HadCKv8ON/rlBz7y5pzzsqsNZoiFEyBsmZEp/1o1ERk=; b=dhNrLuSAovMI5u8rmMECwAVRjzfTMihOkfzsKWMADAY+yhiRqm53OPsR8ReI0xE/UO PEHGRdisJtPAElVer2hh8qs5K/9rO+QIJcbBee5aCWVncEWTfbgQ5qrwYzXPObFYn03e lCIHpwRd1CG0eTZulD5qjbZmsYheNJigOEKWyJBq0INM6xddLOIe//NBLUjsxrcPHbrk 38401Pgnt3CPT3lra94twGQwmeGivAitaHA1oHWwqwCF6adiJgYc3pcY6Tyw50XbVtwg bnoNu4re+/hxnZ29qoQHdaQMhMlg1NwS4upmmWMJ3rDXQynvtqslliRPbyohKVN/HUOa gS0g== X-Gm-Message-State: ABy/qLZjereKErE2rb6oaZ3Hfs4lD2I90YZmyAGHWUp+8PgQqH0foh20 S3hirGuho9IOMHLE/EIsgdV8yf13sWT7W2FZZobbXQ== X-Google-Smtp-Source: APBJJlHZGoLI0pYfbNv47U2EUuBMn6fNkOF09pmUczS/pjaYG5Dnbv+JQIXrQ1n9W8vGU+8BwGWc9Q== X-Received: by 2002:a05:6a20:2585:b0:12e:5f07:7ede with SMTP id k5-20020a056a20258500b0012e5f077edemr16868438pzd.41.1689008885747; Mon, 10 Jul 2023 10:08:05 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b00682ed27f99dsm51799pfh.46.2023.07.10.10.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 10:08:05 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Sinan Kaya , Stephen Hemminger , Anatoly Burakov Subject: [PATCH v4 3/5] memzone: check result of rte_fbarray_get and malloc_elem_from_data Date: Mon, 10 Jul 2023 10:07:58 -0700 Message-Id: <20230710170800.12478-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230710170800.12478-1-stephen@networkplumber.org> References: <20230120044140.95975-1-okaya@kernel.org> <20230710170800.12478-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Sinan Kaya In memzone_lookup_thread_unsafe result of call to rte_fbarray_get is dereferenced here and may be null. In memzone_reserve_aligned_thread_unsafe result of call to malloc_elem_from_data is dereferenced here and may be null. Signed-off-by: Sinan Kaya Signed-off-by: Stephen Hemminger --- lib/eal/common/eal_common_memzone.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c index 1f3e7014995b..c96053b41e63 100644 --- a/lib/eal/common/eal_common_memzone.c +++ b/lib/eal/common/eal_common_memzone.c @@ -77,7 +77,7 @@ memzone_lookup_thread_unsafe(const char *name) i = rte_fbarray_find_next_used(arr, 0); while (i >= 0) { mz = rte_fbarray_get(arr, i); - if (mz->addr != NULL && + if ((mz != NULL) && (mz->addr != NULL) && !strncmp(name, mz->name, RTE_MEMZONE_NAMESIZE)) return mz; i = rte_fbarray_find_next_used(arr, i + 1); @@ -206,6 +206,10 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len, } struct malloc_elem *elem = malloc_elem_from_data(mz_addr); + if (elem == NULL) { + rte_errno = ENOSPC; + return NULL; + } /* fill the zone in config */ mz_idx = rte_fbarray_find_next_free(arr, 0); @@ -395,6 +399,10 @@ dump_memzone(const struct rte_memzone *mz, void *arg) fprintf(f, "physical segments used:\n"); ms_idx = RTE_PTR_DIFF(mz->addr, msl->base_va) / page_sz; ms = rte_fbarray_get(&msl->memseg_arr, ms_idx); + if (ms == NULL) { + RTE_LOG(DEBUG, EAL, "Skipping bad memzone\n"); + return; + } do { fprintf(f, " addr: %p iova: 0x%" PRIx64 " " From patchwork Mon Jul 10 17:07:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129425 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6800342E3C; Mon, 10 Jul 2023 19:08:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F02F942D1D; Mon, 10 Jul 2023 19:08:10 +0200 (CEST) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mails.dpdk.org (Postfix) with ESMTP id D417E40150 for ; Mon, 10 Jul 2023 19:08:07 +0200 (CEST) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6686a05bc66so2609965b3a.1 for ; Mon, 10 Jul 2023 10:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1689008887; x=1691600887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R92bKE5RrcnOxuzq2w4Wy8obvQQT5MGY0zBIIbenUk4=; b=sXHrt0nr6ba6KY8uhgr2iiytI+0Jk/e4OxNkd4E0N30SwZqHF3dCuAmbLSnL9x/gX8 gVF2y87QCiRyHrIDYlmlR/exA394j06kMdhu8yQKSdKRnQpOqw2hOCqDWr5njd+k9fkR 5O7E4y1nX6fEvtZVld2/MIpuvGkmsYXZagAG1Zh/WyDDt22Oijamq6QAwda9mDU4tM/V /JntZ+cQ5BNvxTaC7nTK14tr1MNNOK374nx5/26l8m4Toit776HE4wLgUXyuamJyI6qQ mOuU9Bhd7Zs//fbwJizhbmvlcdJ2Yoaz45M7XGeFCkvRsc8dvo1oypt9L20IswxNkC4N 6Y/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689008887; x=1691600887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R92bKE5RrcnOxuzq2w4Wy8obvQQT5MGY0zBIIbenUk4=; b=F5oZcph9ticpG7kzKcUo8SAU/ze8Fe+gQcHRudP71Aa50AeOLB3oRJOt8xh5Blj+Qz m6hp1D2utW9sw7xHeb5lP8s7KEq2Ap8xohnblgVqvXkEJjXtbvffvo0/k1Pi0kk90Brh OfkCl2e4PqzcY4sDZKMs+ev2pGOmr5VmaWc8Bqv5e3GtidLfafApwUPaSaQsVkP9YoMM Lrq9/x+EgmsoEagZsywTxuLbhcc2tU4clB2EDlmGqNfYwsaYP7OKKI0Yx3gLEBkdflP5 /Gj4RoKmWvgduCzq9neV1m80rbocgb56bmfZg7/jGgUkMwwg1wixQtqEvm4t11/c1ZOz R4eQ== X-Gm-Message-State: ABy/qLZHz7IqM6JAKHf7c4QdVRbTQizLGlO6aPgfdIZU0+vlNWC6iaR7 ORu0oGw0QdyOFzRSaczJh33hsVEMnXMhtdmCAg3gNA== X-Google-Smtp-Source: APBJJlGbEz1oDk7LBo2sQJ2AjjEZpU8J/sZ+at+InrFdZEEa7OGjsYeTzWeNpo43FPbKlEpKTE9mwQ== X-Received: by 2002:a05:6a20:1018:b0:12f:7a6a:7f8e with SMTP id gs24-20020a056a20101800b0012f7a6a7f8emr10416174pzc.13.1689008886796; Mon, 10 Jul 2023 10:08:06 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b00682ed27f99dsm51799pfh.46.2023.07.10.10.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 10:08:06 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Sinan Kaya , Stephen Hemminger , Anatoly Burakov Subject: [PATCH v4 4/5] malloc: codeql fixes Date: Mon, 10 Jul 2023 10:07:59 -0700 Message-Id: <20230710170800.12478-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230710170800.12478-1-stephen@networkplumber.org> References: <20230120044140.95975-1-okaya@kernel.org> <20230710170800.12478-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Sinan Kaya In malloc_heap_add_memory result of call to malloc_elem_join_adjacent_free is dereferenced here and may be null. In alloc_pages_on_heap result of call to rte_mem_virt2memseg_list is dereferenced here and may be null. In eal_memalloc_is_contig result of call to rte_fbarray_get is dereferenced here and may be null. In malloc_elem_find_max_iova_contig result of call to rte_mem_virt2memseg is dereferenced here and may be null. In malloc_heap_free result of call to malloc_elem_free is dereferenced here and may be null. In malloc_elem_alloc result of call to elem_start_pt is dereferenced here and may be null. Signed-off-by: Sinan Kaya Signed-off-by: Stephen Hemminger --- lib/eal/common/eal_common_memalloc.c | 5 ++++- lib/eal/common/malloc_elem.c | 14 +++++++++++--- lib/eal/common/malloc_heap.c | 9 ++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c index ab04479c1cc5..24506f8447d7 100644 --- a/lib/eal/common/eal_common_memalloc.c +++ b/lib/eal/common/eal_common_memalloc.c @@ -126,6 +126,9 @@ eal_memalloc_is_contig(const struct rte_memseg_list *msl, void *start, /* skip first iteration */ ms = rte_fbarray_get(&msl->memseg_arr, start_seg); + if (ms == NULL) + return false; + cur = ms->iova; expected = cur + pgsz; @@ -137,7 +140,7 @@ eal_memalloc_is_contig(const struct rte_memseg_list *msl, void *start, cur_seg++, expected += pgsz) { ms = rte_fbarray_get(&msl->memseg_arr, cur_seg); - if (ms->iova != expected) + if ((ms != NULL) && (ms->iova != expected)) return false; } } diff --git a/lib/eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c index 619c040aa3e8..443ae26d283a 100644 --- a/lib/eal/common/malloc_elem.c +++ b/lib/eal/common/malloc_elem.c @@ -63,6 +63,8 @@ malloc_elem_find_max_iova_contig(struct malloc_elem *elem, size_t align) cur_page = RTE_PTR_ALIGN_FLOOR(contig_seg_start, page_sz); ms = rte_mem_virt2memseg(cur_page, elem->msl); + if (ms == NULL) + return 0; /* do first iteration outside the loop */ page_end = RTE_PTR_ADD(cur_page, page_sz); @@ -91,9 +93,12 @@ malloc_elem_find_max_iova_contig(struct malloc_elem *elem, size_t align) * we're not blowing past data end. */ ms = rte_mem_virt2memseg(contig_seg_start, elem->msl); - cur_page = ms->addr; - /* don't trigger another recalculation */ - expected_iova = ms->iova; + if (ms != NULL) { + cur_page = ms->addr; + + /* don't trigger another recalculation */ + expected_iova = ms->iova; + } continue; } /* cur_seg_end ends on a page boundary or on data end. if we're @@ -430,6 +435,9 @@ malloc_elem_alloc(struct malloc_elem *elem, size_t size, unsigned align, { struct malloc_elem *new_elem = elem_start_pt(elem, size, align, bound, contig); + if (new_elem == NULL) + return NULL; + const size_t old_elem_size = (uintptr_t)new_elem - (uintptr_t)elem; const size_t trailer_size = elem->size - old_elem_size - size - MALLOC_ELEM_OVERHEAD; diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c index 6b6cf9174cd3..0abaaa8c57f8 100644 --- a/lib/eal/common/malloc_heap.c +++ b/lib/eal/common/malloc_heap.c @@ -97,6 +97,8 @@ malloc_heap_add_memory(struct malloc_heap *heap, struct rte_memseg_list *msl, malloc_elem_insert(elem); elem = malloc_elem_join_adjacent_free(elem); + if (elem == NULL) + return NULL; malloc_elem_free_list_insert(elem); @@ -321,6 +323,8 @@ alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size, map_addr = ms[0]->addr; msl = rte_mem_virt2memseg_list(map_addr); + if (msl == NULL) + return NULL; /* check if we wanted contiguous memory but didn't get it */ if (contig && !eal_memalloc_is_contig(msl, map_addr, alloc_sz)) { @@ -897,6 +901,9 @@ malloc_heap_free(struct malloc_elem *elem) /* anything after this is a bonus */ ret = 0; + if (elem == NULL) + goto free_unlock; + /* ...of which we can't avail if we are in legacy mode, or if this is an * externally allocated segment. */ @@ -935,7 +942,7 @@ malloc_heap_free(struct malloc_elem *elem) const struct rte_memseg *tmp = rte_mem_virt2memseg(aligned_start, msl); - if (tmp->flags & RTE_MEMSEG_FLAG_DO_NOT_FREE) { + if ((tmp != NULL) && (tmp->flags & RTE_MEMSEG_FLAG_DO_NOT_FREE)) { /* this is an unfreeable segment, so move start */ aligned_start = RTE_PTR_ADD(tmp->addr, tmp->len); } From patchwork Mon Jul 10 17:08:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129426 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DB7EA42E3C; Mon, 10 Jul 2023 19:08:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2440342D2F; Mon, 10 Jul 2023 19:08:12 +0200 (CEST) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mails.dpdk.org (Postfix) with ESMTP id C5445427EE for ; Mon, 10 Jul 2023 19:08:08 +0200 (CEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-666e6ecb52dso2530625b3a.2 for ; Mon, 10 Jul 2023 10:08:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1689008888; x=1691600888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2GMFqc8q8sKJTab0kCmKrnRqp2uw/m53kujq9DrFXaU=; b=Ezh1r/8mdz0afcNJ06ZkwO4q6cE9iDOPKUFB2YJnNjgyHrdRV1l++gmkfqNCBTMjn+ ey7MsdJGpNGZGU1r+DBPvEnTLzLJjcFyTDq7jcUp4XyrgVLJrQ1k43ZAdt6b2WQxaFQu DjtYMOPOXqEgPSZQ/btYRRrHhnHLPCiFImTJoWd3L2dTp5H+SU1+4sBCoQCPcvlk0DEC IefYRMXNlNG8oVPGH7JlcSYeYZw4UUMU3fXlh5VdhpDZmbAyAkXExotG90VfNIj2F5pQ mjT5j7bXCDzfW8bUCoipC/5whNJQaRs7WuJoE4xzVs25ZTAAq6dxVjbTOLCcoRFAXiBV 0JcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689008888; x=1691600888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2GMFqc8q8sKJTab0kCmKrnRqp2uw/m53kujq9DrFXaU=; b=XJwy8bBdQk/AGXldqEhSvuC4q7gQemjlDZ7GVgNw4hxYxVG04QboiyQ8eQwq/cXnlm zAqq+pEwtDtFoWP/9kCcdPHeMGPZ+T5963qNzsPsz7UBlLqRlqOpsmyPXL/2e8U08Tll fuMsnT/YYpuYf9fDwhM1g7zJfALbYt5AsGBzTDBuTHEx9TJiMBq4onmZ7pOMLJmEfJ0n XY3A8LF8p8KlFzi5dVG1QvVL5S9CMyYxcMbKYxbIzg3CSlxoXOZAsuC+R/jHFPKauMSe TMJQgw1gVI3TQ6w46fDa6Ge44b/iD4HGw/y+k/zOa6kzH4LRcJikMpGIZ1E89fZs9Egz nwXg== X-Gm-Message-State: ABy/qLYa6onQiRb1sYswaad1l9INQFLB3C5peZGxxyafrHtdMo0ZqtK0 uAEMf/rFTQ3TBOk+KVIkI88zf/p718ruOpfSHV4/iQ== X-Google-Smtp-Source: APBJJlEiz0xVzRm66Z8hr2DmoA6HyGBwyoJSH09y8U9uQo2jsF3t9ZPiTovV/5d5Uvs/GbH727Qw8g== X-Received: by 2002:a05:6a20:a11f:b0:12c:dac0:a9a4 with SMTP id q31-20020a056a20a11f00b0012cdac0a9a4mr12969741pzk.5.1689008887778; Mon, 10 Jul 2023 10:08:07 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b00682ed27f99dsm51799pfh.46.2023.07.10.10.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 10:08:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Sinan Kaya , Stephen Hemminger , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Subject: [PATCH v4 5/5] bus/vdev: check result of rte_vdev_device_name Date: Mon, 10 Jul 2023 10:08:00 -0700 Message-Id: <20230710170800.12478-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230710170800.12478-1-stephen@networkplumber.org> References: <20230120044140.95975-1-okaya@kernel.org> <20230710170800.12478-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Sinan Kaya In rte_eth_vdev_allocate result of call to rte_vdev_device_name is dereferenced here and may be null. Signed-off-by: Sinan Kaya Signed-off-by: Stephen Hemminger Reviewed-by: Andrew Rybchenko --- lib/ethdev/ethdev_vdev.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h index 364f140f91b5..6d94a65d975d 100644 --- a/lib/ethdev/ethdev_vdev.h +++ b/lib/ethdev/ethdev_vdev.h @@ -34,6 +34,8 @@ rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size) { struct rte_eth_dev *eth_dev; const char *name = rte_vdev_device_name(dev); + if (name == NULL) + return NULL; eth_dev = rte_eth_dev_allocate(name); if (!eth_dev)