From nobody Wed Nov 1 09:06:07 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 4SL1MN0Mkjz503ql; Wed, 1 Nov 2023 09:06:08 +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 4SL1MM72szz3KVb; Wed, 1 Nov 2023 09:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829568; 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=GLEStKKfU9Lx6d8kXZVf4SMbaP65PT1inBGpxHsqaoQ=; b=ic2RaThb6d1UGsjAe3wYkHB/UY+XzhvvAXI6U1+H2UJYDk0R4I9JmSE4vTU2ioXL/C/v84 dIDBQ28ngjuJ4MD57AhUOBPs7SN7uQvtexwDV46v8XXJigXOqkusJ82tzfppqmLVkBcXRc Yde0R9ClhbAaSM2x5v9wDbzbAimraLyZOXOgM1Gio4scFJyH1QfDe8XzLdIwgElc4fDB5X EaeBSmxIJbsxTVDoAP34mPQRlBhI0yGA0uZFVQmHYTrpgydbR+2VLx8cbZ7wAIXJN3sdKe iUA8AjH4uzLHln6z7qGhK0Mm5GO6g9Ma+irAe+1fV4i8hn+zXgLstmduvYDQVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829568; 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=GLEStKKfU9Lx6d8kXZVf4SMbaP65PT1inBGpxHsqaoQ=; b=puLPfz7KcvNQnGLaAKs3FWD5O8aw034W5O5BFhrKusQ3FxGsqtuJPnRdbqLxohZOOOPrbR cp6reJm5xaGL0cCOXt+tsOPUmqr+LEDJXoSaHzp50jyjZktCOT9UlhHKSgFhhM48TMnfts LQRottXIlVy66w4CplQ/J61ijXrv2KjUvdYywL/SEVp+KerHS7lS49GvP78kw9NBJUCHug h/VJjtxXLvK/fWzi5XHbTVn5wtM/72U6qjz/yoF1ItkziM100hYJuY07DErgYRGA/MexbA xM4GjoZRg/PpImvIJ1YKY8Woujr3YwnGgFP4Os0zQXULTRCI6+SYUTesNOPPwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829568; a=rsa-sha256; cv=none; b=FxkpO5AIT/eZ9N2Qi5sYfY+iMQlkgC5xTFCwxeqcClN0mNiN/kJGqmefJ6uymQsvugME54 g7GlKzRmBNBsv/s2i8jb0ujz7zyFAYGEUGU5aZOMhgPpluB5SDjtTGl2XLuefAOvmLFrsP ELd9INu4qPfRhdmVvk8T5dZ3CFB16HhL+274/2ujdYhu+8zhBWyg2MY0XkrB5LTExvbUUu /cxp4bL+jqcp7M5wFfmBbBmfLpL5DKZL48EQW9cP2bmUfsyi3M/ImkVNYOXq4LFkEXGuIf NtBVkNq4nRD5I5oI1qkRgDk1iNVciIAxRuGuMv1ThQXWEZoi8RnhMgzmeZP9IQ== 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 4SL1MM67sfzfvN; Wed, 1 Nov 2023 09:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A1967WJ065209; Wed, 1 Nov 2023 09:06:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1967Sl065206; Wed, 1 Nov 2023 09:06:07 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:07 GMT Message-Id: <202311010906.3A1967Sl065206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a17aa2314d50 - stable/13 - libpfctl: fix pfctl_do_ioctl() 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a17aa2314d5078060417cbfba30b20088359ec21 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a17aa2314d5078060417cbfba30b20088359ec21 commit a17aa2314d5078060417cbfba30b20088359ec21 Author: Kristof Provost AuthorDate: 2023-10-23 11:43:52 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 08:08:46 +0000 libpfctl: fix pfctl_do_ioctl() pfctl_do_ioctl() copies the packed request data into the request buffer and then frees it. However, it's possible for the buffer to be too small for the reply, causing us to allocate a new buffer. We then copied from the freed request, and freed it again. Do not free the request buffer until we're all the way done. PR: 274614 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42329 (cherry picked from commit 2cffb52514b070e716e700c7f58fdb8cd9b05335) --- lib/libpfctl/libpfctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 54e8fedbe4df..c9a5190d790c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -72,7 +72,6 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) retry: nv.data = malloc(size); memcpy(nv.data, data, nvlen); - free(data); nv.len = nvlen; nv.size = size; @@ -90,13 +89,15 @@ retry: if (ret == 0) { *nvl = nvlist_unpack(nv.data, nv.len, 0); if (*nvl == NULL) { - free(nv.data); - return (EIO); + ret = EIO; + goto out; } } else { ret = errno; } +out: + free(data); free(nv.data); return (ret);