From nobody Thu Feb 9 21:44:04 2023 X-Original-To: dev-commits-src-main@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 4PCVkD5nztz3nnlZ; Thu, 9 Feb 2023 21:44:04 +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 4PCVkD5HTsz4HgK; Thu, 9 Feb 2023 21:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675979044; 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=l2O2TzjOJujgsYYlRRkv6UBpmsibmyu2toGQ+QC+NAI=; b=RVKQvPcp/j8QqbKKGnqTJOPH1bVjJ7UfUO7Uf0DDPBcJN6JcSEzKCsjjrjdAhI7pFAGzBT lzpUQMhowQXUWQciqCVFO/jjQ7Njzg3qZNe/d2anO9SaiGaWkZxLwQUG3EZCeAi7tm+Zvo AsBTXcKy8G7EYalXPqTTJPe8cFSC+EtXtYrXClbDRGU0yNvQep5sOB/3NISQr4G33GX0uz Wq++zot/Y4yGHpueJtHviPFMCEU5tr/C6KDz0B1rWqPBRSDHcfCvLfEcAUu0vVePf626Hh XWIBDFFiSehN47ZMnix6SZzG9j6EB2aTQxGN0g/BvRoX5MQMo6stSoJ7gBtamw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675979044; 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=l2O2TzjOJujgsYYlRRkv6UBpmsibmyu2toGQ+QC+NAI=; b=sQrpqvEVrU/1f+iJXNzENCuEqZCQeJ2eu7zOVpSaP4OideVT0/46tbsNAJO5yVFep3v7oi DZ/ZiLD7tlZmM+vBvDFmUhYq0vuKHqcWXYNulTAPOLw54jPB/LYqG4w8yjGDBynJI+Bvml FJqk8CaCwca3YjkR5JkfDg+TYQ1ZIDo63xs0Aci6+2QLE3rZmSzbfnDlAEyngzRIyc243f mWT2YqBN3G9hwpcyCx+78iXkoqBCjSun5ZqVuJGRTL4qIRoumB4xoIMz+P29bbMBKqkvuR KMB0BUz0i8cm/3vMacr6F4PWL/C502lJkMbH1JyCk7skzl623QX1vG8+RKsIKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675979044; a=rsa-sha256; cv=none; b=gI8vOZGFnNS9InycXZAn0xmmXNzG8HlXWlhlILTcVCuJ4nVy+rSJ4JdheqbR2xNyqx7ITy 18XaWC9KYYfNhkSsNrLpB3/l3zBI2dqi1mIQoW7Z9coz/Gg43ix0HVmWRlNZis6eUdC8Fv aqWij52bY6su7dLM7UIaFeYbKQ0SKwLd3mGIMAHA3QBvYg1GHmOKcbiJwaRgv4QwUXcEc0 u42Z7kKwhyVlbhP3xeegFJlkIAJED7J+jZ8yVRyGxa7Gs62Ibgnf3C/0FsgDjTC1gCuPGl 9ng9PolWQEhWSvTe/mjx5VQtIQLJ3dmlN+qoVXC77sknMt1JdhZqJjmmx78E/w== 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 4PCVkD4MD1zsyM; Thu, 9 Feb 2023 21:44:04 +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 319Li4Cp086217; Thu, 9 Feb 2023 21:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319Li4kI086216; Thu, 9 Feb 2023 21:44:04 GMT (envelope-from git) Date: Thu, 9 Feb 2023 21:44:04 GMT Message-Id: <202302092144.319Li4kI086216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 09f29b03ddf8 - main - sesutil: plug memory leaks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09f29b03ddf857a366f338145693b5449e6ca5de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=09f29b03ddf857a366f338145693b5449e6ca5de commit 09f29b03ddf857a366f338145693b5449e6ca5de Author: Alan Somers AuthorDate: 2022-01-19 21:57:27 +0000 Commit: Alan Somers CommitDate: 2023-02-09 21:43:17 +0000 sesutil: plug memory leaks MFC after: 1 week Sponsored by: Axcient Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D33955 --- usr.sbin/sesutil/sesutil.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c index b11f02177c62..989216690edf 100644 --- a/usr.sbin/sesutil/sesutil.c +++ b/usr.sbin/sesutil/sesutil.c @@ -484,7 +484,6 @@ objmap(int argc, char **argv __unused) memset(&e_desc, 0, sizeof(e_desc)); e_desc.elm_idx = e_ptr[j].elm_idx; e_desc.elm_desc_len = UINT16_MAX; - /* XXX memory leak! */ e_desc.elm_desc_str = calloc(UINT16_MAX, sizeof(char)); if (e_desc.elm_desc_str == NULL) { close(fd); @@ -526,6 +525,7 @@ objmap(int argc, char **argv __unused) } print_extra_status(e_ptr[j].elm_type, e_status.cstat, PRINT_STYLE_DASHED); xo_close_instance("elements"); + free(e_desc.elm_desc_str); free(e_devname.elm_devnames); } xo_close_list("elements"); @@ -618,7 +618,7 @@ static void show_device(int fd, int elm_idx, encioc_elm_status_t e_status, encioc_elm_desc_t e_desc) { encioc_elm_devnames_t e_devname; - char *model, *serial; + char *model = NULL, *serial = NULL; off_t size; /* Get the device name(s) of the element */ @@ -635,8 +635,6 @@ show_device(int fd, int elm_idx, encioc_elm_status_t e_status, encioc_elm_desc_t (caddr_t) &e_devname) < 0) { /* We don't care if this fails */ e_devname.elm_devnames[0] = '\0'; - model = NULL; - serial = NULL; size = -1; } else { skip_pass_devices(e_devname.elm_devnames, 128); @@ -661,6 +659,8 @@ show_device(int fd, int elm_idx, encioc_elm_status_t e_status, encioc_elm_desc_t print_extra_status(ELMTYP_ARRAY_DEV, e_status.cstat, PRINT_STYLE_CSV); xo_emit("\n"); xo_close_instance("elements"); + free(serial); + free(model); free(e_devname.elm_devnames); } @@ -853,6 +853,7 @@ show(int argc, char **argv __unused) */ break; } + free(e_desc.elm_desc_str); } if (prev_type != (elm_type_t)-1 && prev_type != ELMTYP_DEVICE && prev_type != ELMTYP_ARRAY_DEV)