From nobody Thu May 23 08:06:23 2024 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 4VlLNH5fkPz5L8hc; Thu, 23 May 2024 08:06:23 +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 4VlLNH4q8Dz4fLn; Thu, 23 May 2024 08:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716451583; 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=MPAckFDfhEPtW21OTLuO9fssnIrXC3Vdsc4F8bv2vEQ=; b=Gq7WfRcZChxZeu9l5FZz1GByygePBYjzQEWMeEHun/zAT9eBW2ejNY+ugzlAzbF8XOg763 KOj8Y11fK1LwrGfxjkuSQJZbnybJ3B5+hgzXfdHk2VziLn7IqRu7WdTGWB28YPktwqW8OL eDkwo0DQy32nxx1l8ed+opJRK20Iary9hfwmVUPBxbVPf9c0aqZeLmEEGLAmmfdEDy71D7 XtHZdCGMIeOJN/4HNmXSuQ6KUN0nqO8reRIfDF0e+XxxD2/rpisfXnMUX4zfTvdidEgn6z i9HdGkFwTVNn7I4HMPmQKy6TR9H9dfU4GThQTYWHKp2A/E32SPg5L8gykB7huA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716451583; a=rsa-sha256; cv=none; b=JML6Jp5fc/sg0fvowiWtc9tTqO7xLYM9CZ86Usq3yrENswQqoC95Zd+X5yamxdwmA9w7EK 6SUsGDZrkqrW3dQGZAIUrJ0fzYva9NGZ4feANe/YM3hdheNZCWwLOEQil4G44PlrzJWrJV V0LzhsNGcpxl6nJLl+PmGqfqW0RFjlO6INrSEVPvoaUyzbDw2tcpvFl2cmSkdGypt/ngJH R7wmkqEbK8gQgifxyOm5FqVsKCG61wdeu2Vdd3DFgDEiacBJ2hCNcrfXg5MsqOfTFR0IcG yoF8b9Ah0zH47AxkCXNL68Jxe/pj/+ZiGbsRXF5aK/Jh/Mp24jSoNPxV/z5wWA== 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=1716451583; 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=MPAckFDfhEPtW21OTLuO9fssnIrXC3Vdsc4F8bv2vEQ=; b=oYYLNh7HAViDrfbtRQuCKfNaBOWaubBnpTwy4q9zj4V+ld+GkFuax1Y04WH5iTudp6ncY+ 4V54OqzjI8k6nXW8bxPgQQXaQxP1eTX1e3EkxTf0LxJGvRmOYjGjm6j9aNQOiPT6+BmH+U gItY8CLyi4w63NgJGktGIAz9OXu+jieZLvPleTVtspOm0qX9BTGHGJb/bZFQZuhhhfBewj ePm6B9CBpmFuHVvxGteiV5WuLNI4kh2bZn/C6Q9E91TFQjugElUeO0Ndh0bagihZspf2Jp QdXffFXXSb93qpkkGVuAFFW4ltJMUtStAySejXHHgCojeZiS5ufp1h+C8HDWdw== 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 4VlLNH4QCNzhqW; Thu, 23 May 2024 08:06:23 +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 44N86NrT002409; Thu, 23 May 2024 08:06:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N86Ngw002406; Thu, 23 May 2024 08:06:23 GMT (envelope-from git) Date: Thu, 23 May 2024 08:06:23 GMT Message-Id: <202405230806.44N86Ngw002406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 309946854fd5 - releng/14.1 - geli: allocate a UMA pool earlier 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 309946854fd5cb24283cf7a36c9d20c2f2820df7 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=309946854fd5cb24283cf7a36c9d20c2f2820df7 commit 309946854fd5cb24283cf7a36c9d20c2f2820df7 Author: Mariusz Zaborski AuthorDate: 2024-05-19 12:53:17 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-23 08:07:19 +0000 geli: allocate a UMA pool earlier The functions g_eli_init_uma and g_eli_fini_uma are used to trace the number of devices in GELI. There is an issue where the g_eli_create function may fail before g_eli_init_uma is called, however g_eli_fini_uma is still executed in the fail path. This can incorrectly decrease the device count to zero, potentially leading to the UMA pool being freed. Accessing the device after the pool has been freed causes a system panic. This commit resolves the issue by ensuring devices count is increassed eariler. PR: 278828 Reported by: Andre Albsmeier Reviewed by: asomers MFC after: 3 days Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D45225 (cherry picked from commit 4b3141f5d5373989598f9447ab5a9f87e2d1c9fb) (cherry picked from commit ea5a708625e5b5c89333e3e3e9a48fe588f05361) --- sys/geom/eli/g_eli.c | 4 +++- tests/sys/geom/class/eli/attach_test.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c index 16b38e628e35..8c866820b33e 100644 --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -1045,10 +1045,12 @@ g_eli_create(struct gctl_req *req, struct g_class *mp, struct g_provider *bpp, bioq_init(&sc->sc_queue); mtx_init(&sc->sc_queue_mtx, "geli:queue", NULL, MTX_DEF); mtx_init(&sc->sc_ekeys_lock, "geli:ekeys", NULL, MTX_DEF); + g_eli_init_uma(); pp = NULL; cp = g_new_consumer(gp); cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE; + error = g_attach(cp, bpp); if (error != 0) { if (req != NULL) { @@ -1091,7 +1093,6 @@ g_eli_create(struct gctl_req *req, struct g_class *mp, struct g_provider *bpp, if (threads == 0) threads = mp_ncpus; sc->sc_cpubind = (mp_ncpus > 1 && threads == mp_ncpus); - g_eli_init_uma(); for (i = 0; i < threads; i++) { if (g_eli_cpu_is_disabled(i)) { G_ELI_DEBUG(1, "%s: CPU %u disabled, skipping.", @@ -1163,6 +1164,7 @@ g_eli_create(struct gctl_req *req, struct g_class *mp, struct g_provider *bpp, sc->sc_crypto == G_ELI_CRYPTO_SW_ACCEL ? "accelerated software" : sc->sc_crypto == G_ELI_CRYPTO_SW ? "software" : "hardware"); return (gp); + failed: mtx_lock(&sc->sc_queue_mtx); sc->sc_flags |= G_ELI_FLAG_DESTROY; diff --git a/tests/sys/geom/class/eli/attach_test.sh b/tests/sys/geom/class/eli/attach_test.sh index bdb39a806fca..8803fa9f1a40 100644 --- a/tests/sys/geom/class/eli/attach_test.sh +++ b/tests/sys/geom/class/eli/attach_test.sh @@ -39,6 +39,34 @@ attach_d_cleanup() geli_test_cleanup } +atf_test_case atach_multiple_fails cleanup +attach_multiple_fails_head() +{ + atf_set "descr" "test multiple failed attach of geli provider" + atf_set "require.user" "root" +} +attach_multiple_fails_body() +{ + geli_test_setup + + sectors=1000 + attach_md md -t malloc -s `expr $sectors + 1` + atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none + + atf_check geli init -B none -P -K keyfile ${md} + atf_check geli attach -d -p -k keyfile ${md} + + for i in $(jot 100); do + atf_check -s not-exit:0 -e ignore -- geli attach -d -p -k keyfile ${md} + done + atf_check -o ignore -- newfs ${md}.eli +} +attach_multiple_fails_cleanup() +{ + geli_test_cleanup +} + + atf_test_case attach_r cleanup attach_r_head() { @@ -125,5 +153,6 @@ atf_init_test_cases() atf_add_test_case attach_d atf_add_test_case attach_r atf_add_test_case attach_multiple + atf_add_test_case attach_multiple_fails atf_add_test_case nokey }