From nobody Fri Feb 18 16:25:29 2022 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 2FEAB19CC653; Fri, 18 Feb 2022 16:25:30 +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 4K0cVy0nN6z3pcy; Fri, 18 Feb 2022 16:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645201530; 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=TumsYd+zvkXk/ft8sfVS4RvzTSXJWqIjQk8GJuUk+h8=; b=OiGIhXJSbrJ7Wlp6OYa8Ps4/7AIHiWjtthElo+pIZuVfHyYz/rGxq+S16tMFZ/zAMoR96t 4mfpcGfXbA8ez82G2E0LvDfX2JdHV0YTQT2X/rsETIQCmxcDsZWORQ6DknN7jMERuoPMwp 2mS/hsI5wDHjUoV+QyRvwOlbr8rbDEZ32v84M/OOhQKFmc7SpfAnb+VscT0LVwf6jy+/9N YMuZlrexlTBd941SvTx+A5tgxcQo+owZ71mP2VEVnRDUQXbOEm+PdgWBD+d/OJd/Nf+Iog IIfdB+HaizP+2jP72VfNsbO1ypoen6H8Wh3dIaQvcg8Y8w2Juit3bNlYZVQB3w== 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 ECFE620652; Fri, 18 Feb 2022 16:25:29 +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 21IGPTa1099557; Fri, 18 Feb 2022 16:25:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IGPTnK099556; Fri, 18 Feb 2022 16:25:29 GMT (envelope-from git) Date: Fri, 18 Feb 2022 16:25:29 GMT Message-Id: <202202181625.21IGPTnK099556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: fd0d53f85c9f - main - sctp: improve robustness 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd0d53f85c9f5d1a31367eb1b8b5e74cc83afd52 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645201530; 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=TumsYd+zvkXk/ft8sfVS4RvzTSXJWqIjQk8GJuUk+h8=; b=cDWQUOvmvHKDyxP/rpLTNbKq4EZCcR/LPxE43F634cvVdV8xTofUJkgpDZwNkl+vG5rjgl NAQ/dr0uJybWvsp+7CUvSYsL7B/Bmn+SjRE6QdmMDLeIR8Ms6c6y83ygY88+vJRmX82kN8 yFGhdKD93GDezBSwgpVO6NXrdpx0v+CQDOuTTTc1s3Oo7WBYTYlglazOjhbYKEr/R6Gymh /NZTV5UClwDJDlvJuvN07RDYRppH6CuuNBn2Q9KF0FQbAWmEWQMw4N80QjN7AMrm+W+zdr u/nnhQTXZ64mzxtnzqLkMxC2OwEOt4Ww8yGY8dFVLy/WV1bZwgD/+rneRclrwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645201530; a=rsa-sha256; cv=none; b=WEE18zout+g7OhXdqTv1RLNoU1fd8+IqySgoQ+jsfatB3VL9fTzJWRtZTX9C0Lj+tteAMz zRXmFEq5KLhr48EepdyXmS605oqghWXi3diDCHD2kOyrZL+GSehUgRsCn6SdQESQFonpRT 16t9CN4UKQ0PGZ+heX7rUu0goSdLTBAOKouGcir3KSMKHEacvYQi6DgEovtxzuoKqcar+v yz2yCPNk1Pe2xqspr+/Vko8RPnI+uj27h5dlw1jUXHvYebQc002pDiOCKLq9dbhQCIXcIi 3tUinsYJb05CzgFhjkukAxvgsVwUeL8fUUlr3mdUhGO04BVxhiXQ9hN/lNNPhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fd0d53f85c9f5d1a31367eb1b8b5e74cc83afd52 commit fd0d53f85c9f5d1a31367eb1b8b5e74cc83afd52 Author: Michael Tuexen AuthorDate: 2022-02-18 13:30:07 +0000 Commit: Michael Tuexen CommitDate: 2022-02-18 13:30:07 +0000 sctp: improve robustness MFC after: 3 days --- sys/netinet/sctp_os_bsd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index 7d5cef6d5f09..e8d08588fbfb 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -313,7 +313,7 @@ typedef struct callout sctp_os_timer_t; /*************************/ /* MTU */ /*************************/ -#define SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index) ((struct ifnet *)ifn)->if_mtu +#define SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index) ((ifn != NULL) ? ((struct ifnet *)ifn)->if_mtu : 0) #define SCTP_GATHER_MTU_FROM_ROUTE(sctp_ifa, sa, nh) ((uint32_t)((nh != NULL) ? nh->nh_mtu : 0)) /*************************/