From nobody Wed Jul 12 03:10:54 2023 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 4R12nC1qjhz4h3bg; Wed, 12 Jul 2023 03:10:55 +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 4R12nC0l0Yz493x; Wed, 12 Jul 2023 03:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131455; 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=m29nOpifYEUyUwR2FnRB0Ja6HV4BgmJ6EUe905zwTRk=; b=WoZwQHZqvnWRwlWHXjMCjMDsNP7O66CJXPw8oS2TwUgM5Gfn24B+LGx5mVtgjGpYmJRxyj Cc7nxJH/+k8Hh3tZdzptPUZhfyUIF6feFqEf1CHbCSVcjHZsEURrJOHDv1WEPNh9ezk1En K3BCvjoJgQkjRREzzqJf8/AMTty/UkcV3qajMWF1DyTpzS4H7Wil3ExoAHowGqjO8k7zI4 av+kzr2iCET27Cf11QSFDrMEZLxjMj+u8KS6qxNFw67V6Nu0h48MktZBlLBw9oUP0VDdez 5fvR9rVofR4C+gWJonQZ+DRVMtx3HE1mrQHNkM0hhQUqnIrQbEKwPDC8/wvQ8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131455; 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=m29nOpifYEUyUwR2FnRB0Ja6HV4BgmJ6EUe905zwTRk=; b=L/t+cbfpoEEPc7fZwkL2+sABx82t9zSyUEHgx6ylpsJB0uNd0+95GMMfiRUGj/sq7ZukZo it7fbhLb+BwCZ3VJwJBUf2VEtKOfQR9nmtpNnDwwNpBQfLgl7OExLQ/W0PMQRkfrFIBYiE SkwnnxwHGjte38iySFqTfT7liQ4jSPG/TGrKQrjM8DYLIPytOusd9kYir/gYCfi03fHYKP aWH2DXokizeqWcjHdrIZzg8Y44W2smFgAS/bbNZjLUgahz/snTbenaAvCZoiES6uSgPtTV w70HBT9IguaU6OER0XE4FM0/FoqPiSLhAJkqWIaoeAipX28Q2VcdQEjdW8HEVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131455; a=rsa-sha256; cv=none; b=kMioGW6FZrKqg6JuXF4VzZ3R8cNKDtY15/YoXx64CktuCBPwiuQandng3qsambjU7q70i0 z3mNC57NykEjWptXWnOV/cmgsQ2F04BCze/Z2dQvm9GNjSJ/ZSWgCbubWrcmxtHso9M7IT DKS2u0EzEZ5aTqrQhpQ7bUI40vwAbbxoGiz+A141M4u8a34B2dJAf1U/6kan8VsxOzmO78 eymDusSsDzK3Usj5AjbCAwvKqJrEOFaKRuNrT/K66T4vpyjp/BY6tXhPC2dDYFXnU1JzcP SuemX/ZOv5RFxgcB0FooU55OwcWqmT4kUxbGsHabeMUVtbsBtpcvISeLGHNZmg== 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 4R12nB6YhqzsNN; Wed, 12 Jul 2023 03:10:54 +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 36C3Asew010411; Wed, 12 Jul 2023 03:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3AsLB010410; Wed, 12 Jul 2023 03:10:54 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:54 GMT Message-Id: <202307120310.36C3AsLB010410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ea2a3ed3bcf7 - stable/13 - wg: fix MOD_LOAD to fail properly if cookie_init() fails 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ea2a3ed3bcf7e792ba0c0625602ada29424c337c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ea2a3ed3bcf7e792ba0c0625602ada29424c337c commit ea2a3ed3bcf7e792ba0c0625602ada29424c337c Author: Kyle Evans AuthorDate: 2023-06-23 16:41:07 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:05:38 +0000 wg: fix MOD_LOAD to fail properly if cookie_init() fails Previously we'd jump to the `free_crypto` label, but never set `ret` to a failure value -- it would retain success from the call just prior. Set ret up properly. (cherry picked from commit ad9f4e6351fb23ee81bc940638d20af3ca7c278d) --- sys/dev/wg/if_wg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 9c4ebe5dd393..8ba1d229da4f 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2998,7 +2998,8 @@ wg_module_init(void) ret = crypto_init(); if (ret != 0) goto free_zone; - if (cookie_init() != 0) + ret = cookie_init(); + if (ret != 0) goto free_crypto; wg_osd_jail_slot = osd_jail_register(NULL, methods);