t=1747798820; 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=Q1jP0DEnJrx736QJivkJADFzK1TYOl5uKyvQ3LJqU/k=; b=ResAnhLhtDmmu6O3I1KnrZ0yYie7lUXK5cL+sCXxWE0YY9qBhfc1pG6NkFjXpK9YaYXSIY n2132ktl2Njw4C+GrXGSNp8QZEntj8MZQ0tUegRHc09A9TTl2GS41Hm1mbQPbi43fjO0cH CJSE38+8f4u17Kvd93jWxwBOPa+OXMGUCEB+sMDbk0fBAO+UuKrVNNmCiLC6Y+EuaVg5l7 IqkCmmSLAa+9ufsOmBTcU/IpMGPUb6lVWKdS3kPpLU73Aj5+2Y/Jed4vpvVy8qxwYGYDTt f8QPVA/1AFVgzQIwGZfwSjf24ZFvBVw83vdkkF1g7/AJ/Odvfyd1SHXiD+lldg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747798820; 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=Q1jP0DEnJrx736QJivkJADFzK1TYOl5uKyvQ3LJqU/k=; b=fQzOW+Dp9+lSfV3Rb828KFrRFFUTPiI/cqlFkf9joZHry1Tpjg3pqbFVQhLwJLA4JX6nl8 G0ElvjvzLSJZCC3Pc31NBgx/vi3Jl0q4MrP5qiJn7H/RuloFVWlC1e3TscUBV6BtpPQ3vz 5ecudN8Kg4M/GosPK6ypsfMFxy6xTbYQyiIUqa/KvyY7jRIDyrRR4kLHSypOhPgnRjeekr Wv3U9HUOiOiHM1ZbWvUCzWZHkCwwyWcf0yG0b/aN4Fdq7aOpku0ZVuIGG6I4j4t95/ihMj vRoqXsFkplfpBNJz40Ck3PcbtNDx+VwwTdC4M/nO7cVtj3tQTHFJ0OuDNdwY/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747798820; a=rsa-sha256; cv=none; b=v2AkFv6Oze6rrZbwb2YdqrpOJdUDvx7nZu/wuO6Ni4gXyTPOSqP6OKUIkNqJPXj2fIwWEz iULRME+GTuOynhfBcLAd1SISrqGeWgpBoVcHvNtdrkcFZioF41xXNdmGN7765ISAFwDt7R cOUfCDHJQtl1j21kodmuBBcqNVSdSWvaSfPkaWBgnOGX9KcZBK1NO+nAJc5dmfJdjnVF5k 83E7IfXMTqDZ7OTr6lYqaQWhUoatAgqxxyZQvtULplQMOLt5SqdlSEHpTk/Xrq0xK7UH/2 kth6WgYQkevt6qvxbUVixVnfEwg7rLiVz7V8OAyka8CLa60MLDa4A0KLy7UfaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b2HHm0GR6z3Qp; Wed, 21 May 2025 03:40:20 +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 54L3eJPC088439; Wed, 21 May 2025 03:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54L3eJE1088436; Wed, 21 May 2025 03:40:19 GMT (envelope-from git) Date: Wed, 21 May 2025 03:40:19 GMT Message-Id: <202505210340.54L3eJE1088436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 22fc5d7b222c - stable/14 - in6_control_ioctl: correctly report errors from SIOCAIFADDR_IN6 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 22fc5d7b222c815fe1a6c81780efd230c749ed1d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=22fc5d7b222c815fe1a6c81780efd230c749ed1d commit 22fc5d7b222c815fe1a6c81780efd230c749ed1d Author: Lexi Winter AuthorDate: 2025-04-07 12:40:07 +0000 Commit: Lexi Winter CommitDate: 2025-05-21 02:55:42 +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 (cherry picked from commit 1408670c90ae38fd51ea6aaabe46757bc880608e) --- 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 54b9d598b961..326153b1d2f6 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -589,7 +589,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);