From nobody Wed Feb 25 11:30:37 2026 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 4fLXT92fBfz6THRH for ; Wed, 25 Feb 2026 11:30:37 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLXT922PGz3qN6 for ; Wed, 25 Feb 2026 11:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772019037; 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=2La9R2/ynTai5Ak9pNS7j0Vn9VZ+AY+SmpuLlj6dVaQ=; b=kvftWFYd1Rd1cZOB+X4IleW6DPi5eZXVE5k9mJeLHtyaFPw730H7NVIMH7WA0hv/OQyYq3 8Q6ZZxJWr94T4uGVzTbq/XMlxaZLwPn/dXHXNW3EBS+mhiVCW1nhk1PVofoGb3YtefBm2U vOp4cFRZrMrDXOyj0H2L3qvnK0Zy00t69bKbkPViGVTDYHRHQ6hWqIfQtQMgURwvXjDKKY 5Nd49x8jKs1vbvTlDf88zOM0AYvH6YIXQnccSJYJVlxUlP5CnCntYFH1/JbXuAF2UCefuK pTpNoZna/lWbnjKctySI9llhpMhyJLbknZ1Szz/670BbXC1B02e7rQU6dfnkzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772019037; a=rsa-sha256; cv=none; b=X9gsO+/6X/0YNd+fPTVy77PkgxXgjSsM0T2DzH7x+RtmLR4RP1/U/X8Ar8zIxUt5gYNxcq 0TKmnhr+3rzfbu9zz/VFQ1g/KoZ1dzWSar/Jzjy2btjZH2iQbZCV+miq8Jt6e75OS0lrKc 2mnZF3JeyNSirlSxx3muKVOnB5gy9rTovWEducAecsUY7qgJw3zCdiWNiaJtglKLScQbd/ 02q+J2e8fs9y5GcKsteQ99cFmLItuFpBhMwhVBSbL8FnpxruC3pBDR7dDzy6YVKP09Apge KcwTkPMSFHliCLewop4S+FGnilR2fKNuNGA+8qsTq8X0WwAAAnnZ1HQ8Ikx+rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772019037; 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=2La9R2/ynTai5Ak9pNS7j0Vn9VZ+AY+SmpuLlj6dVaQ=; b=chqL3yOv5+Csjnw1MgN9y0hlN1bqflvVoC1a+G/eOW1jlDFD8N6bV2GNC4+2RM2vpWW3ld /o8mVmkgiJvG5gUIgYG2fT+Afp7VDRzce+jIHHCLOIlxJHhKenrwqK19ZrV3mpz4Pis2i1 Ck58wix81ff5/m+E3LWwhBGPbkgMTdLrfsXWuI5xcRFFHVu8l0bRkS722jeIBR96xqbRxg lq4GVe6DcWj1ZpcQzBVSYxY9cE92fSAcgdwu5FLqxsrWof3XRvqPx2qa3rNb8kPyGyWicq gKnJ62lFe9jOhYUvGZr4k20XM0WEwhKpmhmb1eRa5fKii+zHcdRvfrTHHlYw6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLXT91f3Gz10T2 for ; Wed, 25 Feb 2026 11:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3abb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 11:30:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: bce0c14fe19d - main - mpool/mpool_get.c: Avoid clobbering 'errno' when handling 'pread' errors 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce0c14fe19defeef4f02cfebc018e9adf979783 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 11:30:37 +0000 Message-Id: <699edd5d.3abb8.3b1aebcd@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=bce0c14fe19defeef4f02cfebc018e9adf979783 commit bce0c14fe19defeef4f02cfebc018e9adf979783 Author: Bojan Novković AuthorDate: 2026-02-23 15:30:26 +0000 Commit: Bojan Novković CommitDate: 2026-02-25 11:30:05 +0000 mpool/mpool_get.c: Avoid clobbering 'errno' when handling 'pread' errors POSIX.1-2024 states that the 'free' function "shall not modify errno if ptr is a null pointer or a pointer previously returned as if by malloc() and not yet deallocated". However this is a fairly recent addition and non-compliant allocators might still clobber 'errno', causing 'mpool_get' to return the wrong error code. Fix this by saving and restoring 'errno' after calling 'free'. Sponsored by: Klara, Inc. Reviewed by: obiwac Differential Revision: https://reviews.freebsd.org/D55463 MFC after: 1 week --- lib/libc/db/mpool/mpool.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c index 1bab66d73baf..0df19dc09e4d 100644 --- a/lib/libc/db/mpool/mpool.c +++ b/lib/libc/db/mpool/mpool.c @@ -214,10 +214,14 @@ mpool_get(MPOOL *mp, pgno_t pgno, /* Read in the contents. */ off = mp->pagesize * pgno; if ((nr = pread(mp->fd, bp->page, mp->pagesize, off)) != (ssize_t)mp->pagesize) { + int serrno; + switch (nr) { case -1: /* errno is set for us by pread(). */ + serrno = errno; free(bp); + errno = serrno; mp->curcache--; return (NULL); case 0: