From nobody Thu May 18 16:01:22 2023 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 4QMZTb1xQTz4Bk2w; Thu, 18 May 2023 16:01: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 4QMZTb1Rhkz4PVV; Thu, 18 May 2023 16:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684425683; 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=8nnGlHffoA1JXmi0uCxwuVA0i9rqFpFcGTETzPRqgOQ=; b=R5xBLG+uM1BB+S6jojSwhWPk76P7nb0sabl+eHIxxuIXK3p4KCDd+5nWP2AAuGUkPNvDy8 +3KRsKcotiNva89vygcpwZg0GKjMql6AF5RlDSkPd6LGACPgj0FQ/xgompXrX1P69Dx0BU fXW5ShL0kcI2PNMnLIMQYOkOZ6BCuRuK2lvTu6M6aNve5u/Ix9/GMUvqAvoNIt8qJb0w/K vrh7sJRGKxb+0+B9juYevWoM7i1n+Enct2zTm1ZAvsC02X6It5s04LbYV60S2MW6vR6zz2 ijSEjnGi5/ssoy34DrjpuVXe3iF+t9zQnvZeLms9c60aoysl1eMeZu3YEkEfBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684425683; 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=8nnGlHffoA1JXmi0uCxwuVA0i9rqFpFcGTETzPRqgOQ=; b=dj+eC+ccwEsgHMGrlXfeSdZ/P6wygT3VHztamomhdkO2WZ85+OU0i2Ju7v0jL5d6k2RLOS DlHcps1OvDafebkq1TjvlxkRNn26ftz5n1IMwssTndiPbQvxLkmSgPMU7N7JnU5+OR51XH E3q6sdHcjhrLs3AAHULzbRw8H4F85cxeW6n1b+wGfzHiUh0qGsjqli2RaszdiK9B+FCOWe 0lUSyEaq+jDw/L6gTLjsqhJ5GlYP1nIbvcxB/tVIKYPrAT/4hVuwWi2ufNgldcLPL4uvT1 IU1Asra3u7f0/s3kOVc9skkyZOTiKobcJIFCMZuYlGmbqXDfvMAOlOv2eOevaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684425683; a=rsa-sha256; cv=none; b=h0xPq99iVwcxcRJDh9qQ/JYVnEM1T0nU6wgxAl/nr2PX33z+0A2lg28QhcgbSy/TRBZ0Ay MpXgCZaz66Hk/kJ8tcOaljEVCJYjdBwqT3HqCHNVCdY0BrUxRhRPzJg1DaYYarIa2kJ8rI 4DluGvW3//ASUPL4NDsb6LGbn72bsovs2gdeM15XkfCh8SAY0Lg3j3QJqCm7iaoNMc3/Yn k/8pQYW5O+v8IXdy1OfEgAE2+HnMDOa4/xXSFACXafNPKd4rzNUUIL91unZlA4pH3PyBcv ExFGWXIJzZ4FWJPEIKLgI1SIhAu3gZyBFcw/YH9aBhuez7ahQTwKOWupaJkYEg== 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 4QMZTb0X8TzsC1; Thu, 18 May 2023 16:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34IG1MbQ013673; Thu, 18 May 2023 16:01:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34IG1Mgo013672; Thu, 18 May 2023 16:01:22 GMT (envelope-from git) Date: Thu, 18 May 2023 16:01:22 GMT Message-Id: <202305181601.34IG1Mgo013672@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: 2d9d97e66e9e - main - ifconfig: improve error checking for carp peer6 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2d9d97e66e9e29de128c21cb676b9661df20dede Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2d9d97e66e9e29de128c21cb676b9661df20dede commit 2d9d97e66e9e29de128c21cb676b9661df20dede Author: Kristof Provost AuthorDate: 2023-05-17 19:39:42 +0000 Commit: Kristof Provost CommitDate: 2023-05-18 15:47:03 +0000 ifconfig: improve error checking for carp peer6 getaddrinfo() returns 0 if it succeeded, but it's not guaranteed to return 1 on error. Check for success rather than for one specific error. Without this fix commands such as `ifconfig bnxt1 inet6 add vhid 1 peer6 2001:db8::1/64` would segfault ifconfig. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/ifconfig/carp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c index aab5f2985328..2a2d8ce407ab 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -237,7 +237,7 @@ setcarp_peer6(const char *val, int d, int s, const struct afswtch *afp) hints.ai_family = AF_INET6; hints.ai_flags = AI_NUMERICHOST; - if (getaddrinfo(val, NULL, &hints, &res) == 1) + if (getaddrinfo(val, NULL, &hints, &res) != 0) errx(1, "Invalid IPv6 address %s", val); memcpy(&carp_addr6, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr,