From nobody Mon Apr 07 22:11:51 2025 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 4ZWk2b5lWWz5sGN6; Mon, 07 Apr 2025 22:11:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWk2b57YDz3P6Y; Mon, 07 Apr 2025 22:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744063911; 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=Dli8fxfZVJOko7RcSLHbi2MLyKwAOfBC2V0iufFYKaw=; b=sD5ALMM02sWYu9hN0QHmx3j0H9IvUx9mp7xSDW7KZ+Dg0lj1WaYeA2T9BCav4WVOgpGkio VHDsiw/xF/zwydDLCuzFsRfvM8sFDI/IoaaFLquCIKCE/YThBF42DsnhNQuqOb26WOX4XG Fhbwo7yROs3z0vCEQd1qjqnU244ByhNEdfs5hd0jsPE5jRjbkm6Dc5kT5vjV9bwEGKYTH8 RhpzWNp4wI+I9AsEUhChm3QJPbRxxiRzFB64JsLFiBppNlJTpkg1wxnFkhZX+zS7aok3Og hQ2L3ZrYHKG+gRwPNzuycxyay2ZvGepsF6567+ao6SjdJQW2xrxBzWWDijCJvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744063911; a=rsa-sha256; cv=none; b=N2lFoIcO2zclTFucNYTqHH/MUjrDsxVqhXmtvUQHZtf3UsxuXy3LWux+PNVmlYHdWqWNXN SnDBnMGbCkwxgDiOQ6ie/AoqAFSiAzo5SkBY9sTIAc31qacZfdEQtMZKjshwqzS7IAKjNU xh9ETIwgMVcOQDLNhTFUu6CeOOG2hL/UvR15TNc6l02jjA9YY/3bWJdULMHXHqsZOgC1kr yDuGyLh7ae3E0qysUkgT2VfBJPwwuiBW2KiS3uhnFpSiecl49K0w80eB4413RiBEn19qHT mik4B7C7b/GMorrLHaqx2lU/09aGpo5Lm3lX4oHkg0wk7REQ5c3rbjpxK0FuQw== 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=1744063911; 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=Dli8fxfZVJOko7RcSLHbi2MLyKwAOfBC2V0iufFYKaw=; b=doLtAhdpa16frGIldmSuHChvttW81gaE7rO0awaU/8I6k8fxWfWrWHUIjSgs1I/gOes5We lZ8g6J36tjPRYE+liOU/mPOyYL/G4xPke33Zw2hWypxZ4KVWZ83qMMlL+BO2RiBM+DyB7f ViGOBKJX0g8oMNsvqNLx6zGpgpRtfx98bOfSOuSes/QjinkJAtVMdwJZVkwrjYwhfHrQ/F JhvJyioirSNTpDezmNGKc9uaSn35KxTi/IbnfGY48k0fHHjOJrO4zQ6JI+9cLCfA0Q82GK u5Oz9ltesHKyIX5Cyn+Be8V2AOS00UzAREPJ+1JSShDSxEFr0QGY225LxxU0rw== 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 4ZWk2b4RcRz145B; Mon, 07 Apr 2025 22:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 537MBp91093660; Mon, 7 Apr 2025 22:11:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 537MBpsD093657; Mon, 7 Apr 2025 22:11:51 GMT (envelope-from git) Date: Mon, 7 Apr 2025 22:11:51 GMT Message-Id: <202504072211.537MBpsD093657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1408670c90ae - main - in6_control_ioctl: correctly report errors from SIOCAIFADDR_IN6 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1408670c90ae38fd51ea6aaabe46757bc880608e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1408670c90ae38fd51ea6aaabe46757bc880608e commit 1408670c90ae38fd51ea6aaabe46757bc880608e Author: Lexi Winter AuthorDate: 2025-04-07 12:40:07 +0000 Commit: Kristof Provost CommitDate: 2025-04-07 20:46:03 +0000 in6_control_ioctl: correctly report errors from SIOCAIFADDR_IN6 we have to use 'goto out' here rather than 'break' because otherwise error is set to 0, which means the error is not propagated back to the caller. Reviewed by: kp --- sys/netinet6/in6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index ffbe64f4de80..00a0b40154d2 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -587,7 +587,7 @@ in6_control_ioctl(u_long cmd, void *data, #endif error = in6_addifaddr(ifp, ifra, ia); ia = NULL; - break; + goto out; case SIOCDIFADDR_IN6: in6_purgeifaddr(ia);