From nobody Mon Apr 6 09:08:56 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B52F345CC2 for ; Sat, 21 Mar 2026 08:23:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774081392; cv=none; b=JV5CrcEWAER01IRENhnexf9rR9jjVTN7M8Pse0No8XdwmTGek9iBKXrI6H5FrG69dOdz83bozbYW1V5Hj1NhhTNqh6joKJMhES5TyVznYTZY3J2lKosnc383X61nbwlHZsvfoPSzQrkgNytZUYEdaoP+o1nZvBJWeTNy1sgv6oI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774081392; c=relaxed/simple; bh=oy1TiK2HMgL9PUkVFRsV3/GSe0h1mvxxtKBtBtghqao=; h=Date:From:To:Cc:Subject:Message-Id:Mime-Version:Content-Type; b=fEeQexyYqDKqpdD5RTjnHZCK3CuQb79MsyUKe/7C41WuDFhcPQ1+cgLhAQyKxUgtfffGZBCzOpgNZFs0aYoY9JG1bLwdFv3EQF89P0DHjjfa15ad/W2alRKb7C5fUG4c4ZOrUD0tqGZioLwPbHdl3WeYmESvcSlWWxFfAfIDAKE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eNCmIYiN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eNCmIYiN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F257C19421; Sat, 21 Mar 2026 08:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774081391; bh=oy1TiK2HMgL9PUkVFRsV3/GSe0h1mvxxtKBtBtghqao=; h=Date:From:To:Cc:Subject:From; b=eNCmIYiNH9GmnBmdZyFTBtfvyovRNOMkR8H/KSOBlLL5+BP4ZLQPkEh+Qpkhy9fu5 qj0rRzLd8NplKuf5Zew8V9Etm0eYFmKrMzNHxP1N4izHRaQ/hHBuE+/EBDgyblSKGA 0Ul5hPeSjOhna5UszoyH8xBJ+oG+bZSrgV1rQ69aY/NHZ8o8wP2ySv9sFfEahEHtdq uAg6U//hipqlZoIgPBLb4N6GmpsTSH6YTmLeog8d0R3of8PVbQaDF9qE8dT//5Z0lV R0bz8PjS8HTizS9qOfXaj8rqNz0vN4JZs3WJZtwzxTye7KXsTKY1vxYyN7VlSDmN9/ 8rM3LM2gPTZfg== Date: Sat, 21 Mar 2026 17:23:07 +0900 From: Masami Hiramatsu (Google) To: Linus Torvalds Cc: Josh Law , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org Subject: [GIT PULL] bootconfig: Fixes for v7.0-rc4 Message-Id: <20260321172307.7fbdd7de328054aa0dca7dca@kernel.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Hi Linus, Bootconfig fixes for v7.0-rc4 - lib/bootconfig: check xbc_init_node() return in override path Fix to check error code of xbc_init_node() in override value path in xbc_parse_kv(). - tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure Fix to close fd in fstat() failure path. Please pull the latest bootconfig-fixes-v7.0-rc4 tree, which can be found a= t: git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git bootconfig-fixes-v7.0-rc4 Tag SHA1: a701749c7ddb8ebc9b7a5cd94118b8365bb107ea Head SHA1: 3b2c2ab4ceb82af484310c3087541eab00ea288b Josh Law (2): lib/bootconfig: check xbc_init_node() return in override path tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure ---- lib/bootconfig.c | 3 ++- tools/bootconfig/main.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) --------------------------- diff --git a/lib/bootconfig.c b/lib/bootconfig.c index 2da049216fe0..e88d0221a826 100644 --- a/lib/bootconfig.c +++ b/lib/bootconfig.c @@ -723,7 +723,8 @@ static int __init xbc_parse_kv(char **k, char *v, int o= p) if (op =3D=3D ':') { unsigned short nidx =3D child->next; =20 - xbc_init_node(child, v, XBC_VALUE); + if (xbc_init_node(child, v, XBC_VALUE) < 0) + return xbc_parse_error("Failed to override value", v); child->next =3D nidx; /* keep subkeys */ goto array; } diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c index 55d59ed507d5..643f707b8f1d 100644 --- a/tools/bootconfig/main.c +++ b/tools/bootconfig/main.c @@ -162,8 +162,11 @@ static int load_xbc_file(const char *path, char **buf) if (fd < 0) return -errno; ret =3D fstat(fd, &stat); - if (ret < 0) - return -errno; + if (ret < 0) { + ret =3D -errno; + close(fd); + return ret; + } =20 ret =3D load_xbc_fd(fd, buf, stat.st_size); =20 --=20 Masami Hiramatsu (Google)