From nobody Mon May 16 13:51:19 2022 X-Original-To: dev-commits-src-branches@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 864841B353D8; Mon, 16 May 2022 13:51:19 +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 4L20yv31dbz3GRT; Mon, 16 May 2022 13:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652709079; 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=muF3uLkhwipwRfkj8oKgS6ayzPptYApl+3L5eETO42c=; b=dSvslkMCdNMSF7UlsK5ZtE0U2tftdvYt3l+ojMrRbj0Mh/tK1KQKHlY+sUIRlMB3C/f/jP ONt1gIDNhIbkrywZHH1nih+eO6QsDbtl4A/0ah+qK9d/j7QIpJI1vtptZ5guvhsP6U1Yv6 BnhYg7v1vN4xqIFW+riButQ+mnDVAao4cGoilE/WVvrLQPhk1gvGiDJIT+NNZnT45aARa1 mPjQ8oesrBCqJ+ENzSZctYum8v9rYDY+rHci3AgLmCaBdX07gaxnR4enKJINiqqXM5ZDiW 3kVEkkG6QZXYueNAlihqmwRkD3Taa9b8i+QLMXC9HRkB10hS6mrx68GlEAGT+g== 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 2786520BED; Mon, 16 May 2022 13:51:19 +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 24GDpJiD079659; Mon, 16 May 2022 13:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GDpJYD079658; Mon, 16 May 2022 13:51:19 GMT (envelope-from git) Date: Mon, 16 May 2022 13:51:19 GMT Message-Id: <202205161351.24GDpJYD079658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 274e8fff3162 - stable/13 - savecore: decrease filename buffer sizes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 274e8fff3162c5d5bd84dfe7240d3b463de12300 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652709079; 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=muF3uLkhwipwRfkj8oKgS6ayzPptYApl+3L5eETO42c=; b=UwLiMB43XLtk0kpwHIy6V4A5Cf/BdpoERh+OM0AN2DK77YRmWleMYJ3yQNzVwvOIlxJcIX XSJF3Zs/JNSg3qRrU+04O4hxVcWLFyxGGd5ifQCZK6qmfEeW5WKZGM1efZrrpGnOs/LhUc N/BtAHmRTNK80OiuRIjGN7DSmhMfEZzV2+JGY4lGNZWqgSP8JxX1O1NlG60hrpGlzW1ncI +09vww0tk+ONBAgedcWHupWltCcsbojxDrK6inzFroJeOugbcFHNpr0D4GY6PumnLOc0sr bLiBv98LxVN15nkY0R0qRtCj5S6nhAStrhvlT7e0fG9zmOsZS/tbTjG8zXhPEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652709079; a=rsa-sha256; cv=none; b=kbu0g0qs25jfKQV7VoWCqqQE8Nn3IgfPr/TyIlaNLxRa0P60GwDM3k82dyHgk2ddqs/msn ndXweQuw8DdQbXbBhlPvftQIfgmLEZoWKjhkadUJ+cuuacyqks6Me1cpeuPVXwTcctOJef 8WI+n6KKgCJ180ZClY9Y2JiSJSjQmRoeew2/i0L3Yh0TX1tdt0bxceWK2mkPKZoVseH4tE L/RHu2cl83NumGYwpPQXJS4ao7okv4LKVsZA0DL2I6KJH1u0I+a45a8ZpDpuvqEAGbnBnZ 19VfkGi/Bsi2iuFSyVPM46sl/vkky89oeJFO6gUeDfYdkgzIiU0vldJ8e8maFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=274e8fff3162c5d5bd84dfe7240d3b463de12300 commit 274e8fff3162c5d5bd84dfe7240d3b463de12300 Author: Mitchell Horne AuthorDate: 2022-04-18 15:19:14 +0000 Commit: Mitchell Horne CommitDate: 2022-05-16 13:34:03 +0000 savecore: decrease filename buffer sizes All files are now created relative to savedirfd, e.g. with openat(2). Therefore, we do not need character buffers to be PATH_MAX bytes long, just long enough to hold the complete filename. 32 bytes is long enough in all cases. These can be allocated on the stack. While here, fix an error message that attempts to use an uninitialized infoname. Reviewed by: markj MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D34821 (cherry picked from commit fafeb5342b6402e112e00ecef4e4b49e894e2c11) --- sbin/savecore/savecore.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index 755fef6bf31d..5e7a7115b0ad 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -318,7 +318,7 @@ file_size(int savedirfd, const char *path) static off_t saved_dump_size(int savedirfd, int bounds) { - static char path[PATH_MAX]; + char path[32]; off_t dumpsize; dumpsize = 0; @@ -342,7 +342,7 @@ saved_dump_size(int savedirfd, int bounds) static void saved_dump_remove(int savedirfd, int bounds) { - static char path[PATH_MAX]; + char path[32]; (void)snprintf(path, sizeof(path), "info.%d", bounds); (void)unlinkat(savedirfd, path, 0); @@ -697,10 +697,9 @@ DoTextdumpFile(int fd, off_t dumpsize, off_t lasthd, char *buf, static void DoFile(const char *savedir, int savedirfd, const char *device) { - xo_handle_t *xostdout, *xoinfo; - static char infoname[PATH_MAX], corename[PATH_MAX], linkname[PATH_MAX]; - static char keyname[PATH_MAX]; static char *buf = NULL; + xo_handle_t *xostdout, *xoinfo; + char infoname[32], corename[32], linkname[32], keyname[32]; char *temp = NULL; struct kerneldumpheader kdhf, kdhl; uint8_t *dumpkey; @@ -719,7 +718,7 @@ DoFile(const char *savedir, int savedirfd, const char *device) xostdout = xo_create_to_file(stdout, XO_STYLE_TEXT, 0); if (xostdout == NULL) { - logmsg(LOG_ERR, "%s: %m", infoname); + logmsg(LOG_ERR, "xo_create_to_file() failed: %m"); return; }