From nobody Mon Apr 18 15:57:02 2022 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 B4C6F11C9B23; Mon, 18 Apr 2022 15:57:03 +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 4Khs4t6XYYz4mVP; Mon, 18 Apr 2022 15:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650297423; 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=aALUcjDLrHpulcrGGEJC5xA0lO0BI9BRny88klwDPpk=; b=h+/C6/3O+zVLPaOYluS0PWZrLIOKWIRr83ImqBF+mRQVRTaPSgIdEHB5G4jQ55uCvwlxWb Kei1RooeGBkCm0fQS4XRtxePaOJmY7oKIu+VwMWNLAtHNtb3Npx5PvvVeLyonp8cyTb+QS 3Gt6R58Za85O5cQ4cTlufr93M7UecPVEr8w2ValKeun4aq+M22P4NLYsctZk/3mAxJJW4q MKPxq5HNMVDi3c/rlXsvVqnzfvRb8NZ/s/mhhGw+p9qL0teuSnViPof6/1t12jBl1/otmQ 19Fa4wYEKgW2LwiJJlCv7bha7ZArAiQ3nVoVrBhjwUy8r9fetbXDX9YyJoFljw== 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 AC56715B8D; Mon, 18 Apr 2022 15:57:02 +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 23IFv24k031461; Mon, 18 Apr 2022 15:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IFv2gp031460; Mon, 18 Apr 2022 15:57:02 GMT (envelope-from git) Date: Mon, 18 Apr 2022 15:57:02 GMT Message-Id: <202204181557.23IFv2gp031460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: fafeb5342b64 - main - savecore: decrease filename buffer sizes 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fafeb5342b6402e112e00ecef4e4b49e894e2c11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650297423; 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=aALUcjDLrHpulcrGGEJC5xA0lO0BI9BRny88klwDPpk=; b=I4NiA/M/2+y2slmHXp+NHXk56emB0h4UBGmCmyitRHcVaSfS2OeAjUCDKOk4/azXConSx6 6U9TmYk1PgxMopQkGuB32N8pib1BAjKTnj+EaDEnisMuAeMyp3QMAni4YAqYfUv5HzIeDg wgQ/KlNkVBwNfpoXeMXoyakG4ZWNPPYejlWqG2p2ifBJZ5L7FsbRP4iOLunbLvywAUDTD2 MEXuUSCU77Gg0GhAXjIzo6/LPo8qg3CtKmnF3hjbfZzRndyQy75AitueqPGED8cT1onIuA qAB+qzx3WrXJoX7EdbQQzudxcMCTmwo/b3S8B9tfo3taRp5Z/W/KyjLytXLtQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650297423; a=rsa-sha256; cv=none; b=CtzxTV1+irF97ALCel91qcdmk9HEoiUXW41Zu1Vb3dYl6HmwNnbjLl0d11RRXTb2hUdG1c YE7AQsMjhCcFEFr1v/v6unIbBqbkS2fbAA/OrxIGazL9uF1ztMIziB99KWqRq3+0FXX5Xl bZgWqFYCforZxMTZ52encfCo1QIsgtKxJf+LzJDe4ei77FoBxPySW+bNWKJ0s6VU8KkG/P XeRVHmIruu4AV9xwXwhsL3ZmmadqI9OQSFlko7xTwseBRBs8MNOfd/E7Ucr3bN21tQ1pJq lJEyCraPhQadBkskHvjcXs5TvXYh4mFAcQp1+wLytGmjMyKJ5Vm6FMfZfmMkpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fafeb5342b6402e112e00ecef4e4b49e894e2c11 commit fafeb5342b6402e112e00ecef4e4b49e894e2c11 Author: Mitchell Horne AuthorDate: 2022-04-18 15:19:14 +0000 Commit: Mitchell Horne CommitDate: 2022-04-18 15:56:15 +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 --- 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 7f84f8805659..84676e1c79cb 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; }