Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 May 2025 03:40:19 GMT
From:      Lexi Winter <ivy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 22fc5d7b222c - stable/14 - in6_control_ioctl: correctly report errors from SIOCAIFADDR_IN6
Message-ID:  <202505210340.54L3eJE1088436@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=22fc5d7b222c815fe1a6c81780efd230c749ed1d

commit 22fc5d7b222c815fe1a6c81780efd230c749ed1d
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-04-07 12:40:07 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505210340.54L3eJE1088436>