From nobody Thu Feb 23 02:42:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PMckl2D7Cz3sq43; Thu, 23 Feb 2023 02:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PMckl0P14z4H25; Thu, 23 Feb 2023 02:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677120159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXyoPJayPFDCS/hhIv8tmUUCe5FvA3Qaom4RNJhgzgU=; b=t9Z9x/1T579x4qNcn0bFCprhGIIIEIsNwFjEz541sFnlsIhzZKrGutWd+oLYfFnXYS48QC kZz5IgSbzukqeWn2J8CwGCmEbPlrBssIztB0TzEK5+tXAylZEQT7Ell3bSRVsDgr/rvunS EeiMzAbXZGsSIQrweQoems6xdLVjGCcfafQ6wrQ5y8lx5gPwT8vS2i8fDJEt0hL4hwCkib rxogLVdPeE+OvB/J73tiY1IgFgeRvCqSu5+rmBZqibh3zWEmUFxxrnKZN5B9xAyTbZ1rB2 9GcFjwPinXkCz3nnfd1odd5AH7EEuFvV6+QUIvLxYS45KxleZxRn7fuzL1iOMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677120159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXyoPJayPFDCS/hhIv8tmUUCe5FvA3Qaom4RNJhgzgU=; b=pmvhZacWFEmqeYyPb6Dj87D9mv9W48osnlE2CRt9OIXz8j/x8yZeRBNDy8xoOjY6WGmM92 iZ3wwF7/wPXkl8G20ndwULIII35y8G8K96Rdn/6WG0xCvJyawC1su4OVRatOb7mzgaMeSi hRvWbMpmUMkjiTwLek5ESE6vZZbbuuEkFwCLWf8OdHY334+qC8askTijG5aKd16gxOrQ/t 7BYNcZxRy8tPqZTggF6ucFiZNtKq/ItmMCfneMW7f+kRXyxgkLB9kWUSKxSh9VlH6HAXos feQ6Yv6zTwgPacvIpPXUbLy70qVrHG3jxu3y3RQbAdXlh58bjlfM46XrYceKGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677120159; a=rsa-sha256; cv=none; b=lx8UXwgxp3e2DKjBE/yATCz5UjrEC01LVnUCwQQcNOUc/5brWpJLQNVUASHctgitW2bMno qPmI6l+DSQk6FT27oJr88qWTWndOthpXdTRCUqa/+ufTC8Qvuq3Zs37xC2dR4fLWpM9sk6 JaMzAEIXTmOO26T5w9XFaIf78EJmJ/gNAHHamD87wgYAJ1gc3+cT8mgG+wZnVWvecjvPwi i08l3W/kILLMzrk39b+NnKLIFTtQBDm+U5aKnv+7dBqBiTY6Da8Ck0HL3xiyK+BxMtZD/M 8LFI0f+i6Bjm8dFJS4BcTssVdOnkVdn2sbRhYLMXXJrkeKeT5tmRMbwZTL5LjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PMckk6cYjzQpm; Thu, 23 Feb 2023 02:42:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31N2gcvq071346; Thu, 23 Feb 2023 02:42:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31N2gc67071345; Thu, 23 Feb 2023 02:42:38 GMT (envelope-from git) Date: Thu, 23 Feb 2023 02:42:38 GMT Message-Id: <202302230242.31N2gc67071345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: David Bright Subject: git: 3ff497061b33 - main - Fix Coverity issue in the NVDIMM driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dab X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ff497061b3323021ae5f8cceed075fc2bc25e40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dab: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff497061b3323021ae5f8cceed075fc2bc25e40 commit 3ff497061b3323021ae5f8cceed075fc2bc25e40 Author: Robert Herndon AuthorDate: 2022-10-13 17:02:28 +0000 Commit: David Bright CommitDate: 2023-02-23 02:42:12 +0000 Fix Coverity issue in the NVDIMM driver Summary: Coverity reports a potential memory leak in the nvdimm driver. Examination shows it's real; fix it. Sponsored by: Dell Technologies MFC after: 1w Test Plan: Changes in use at $WORK Reviewers: robert.herndon_dell.com, vangyzen, bret_ketchum_dell.com Subscribers: imp, badger Differential Revision: https://reviews.freebsd.org/D38676 --- sys/dev/nvdimm/nvdimm_acpi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvdimm/nvdimm_acpi.c b/sys/dev/nvdimm/nvdimm_acpi.c index 7e41b04fd60f..11afe44f9477 100644 --- a/sys/dev/nvdimm/nvdimm_acpi.c +++ b/sys/dev/nvdimm/nvdimm_acpi.c @@ -67,14 +67,18 @@ find_dimm(ACPI_HANDLE handle, UINT32 nesting_level, void *context, ACPI_DEVICE_INFO *device_info; ACPI_STATUS status; + device_info = NULL; status = AcpiGetObjectInfo(handle, &device_info); if (ACPI_FAILURE(status)) return_ACPI_STATUS(AE_ERROR); if (device_info->Address == (uintptr_t)context) { *(ACPI_HANDLE *)return_value = handle; - return_ACPI_STATUS(AE_CTRL_TERMINATE); - } - return_ACPI_STATUS(AE_OK); + status = AE_CTRL_TERMINATE; + } else + status = AE_OK; + + AcpiOsFree(device_info); + return_ACPI_STATUS(status); } static ACPI_HANDLE