From nobody Wed Feb 23 00:18:05 2022 X-Original-To: dev-commits-src-branches@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 AD4AA19D5500; Wed, 23 Feb 2022 00:18:05 +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 4K3GpP4Sz8z4ZKC; Wed, 23 Feb 2022 00:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645575485; 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=NEXt4XXqhBvxFM7xpiGtVyAB8dpFSuRvJjhccgLPUxc=; b=DIuikrXPqW90+NWmViiMqclHdFrvu1cwj/iDwtYKB6oZd7brhNEFwN3xKSeQ9e7bxcMq1p GU+11InGHTun1AMpbP9lWEo+dqmIuuNaMA1y0IArAOwMduw6L0C9pCWqPWodma6fi1pU7g Ss2f/GUII9ZGnFxQAJ6qbM4AjnhhMgw8Nfi70xSMebnu1PlPC4g4hDqTej8vbnHN+XyYuT 3Rk1yWfJFWkMWSQB1AUATH8L+lPG3Dho6iGoZYUsGMCTj68MqJShLe1CexDb2lOblahmit MR0B52KhF2DaKFx7iyWKlLwTOe2QNbpTUMD0LU3UdFuKLbPfFh84a57v1B9/5w== 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 7968B6370; Wed, 23 Feb 2022 00:18:05 +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 21N0I57V079740; Wed, 23 Feb 2022 00:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N0I5f6079739; Wed, 23 Feb 2022 00:18:05 GMT (envelope-from git) Date: Wed, 23 Feb 2022 00:18:05 GMT Message-Id: <202202230018.21N0I5f6079739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 153446e530b2 - stable/13 - sctp: improve robustness 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 153446e530b2b1ceb18c3283c45e265febf8766a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645575485; 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=NEXt4XXqhBvxFM7xpiGtVyAB8dpFSuRvJjhccgLPUxc=; b=ZdNuh0RQ6lqG0+45gi3VhO0a/UnxrOpdszaWrh+VXLqkOrmRG/IrG47+6RDudrqSr1NY6y /17XDXvAl6GxH3E1WvhWujDCKo9FWdsguhwyLNqgEUFZQMRSqGq0vW4hoDtGLlkCIdKyAI tLUuClPe2qO4O7LrFkXk8PDkOugzV20mgDVR9q8GwcIOsLEOWoxobOivCXNoBsGoxotDj5 kz8cwjE5RKdKaH9nhQ3bifUo/R68Pudlpw9BB9XmDmOAoWCIG2HiGnEoPI4DIHz6M3mASi WYt6k/QFYUhSCRXPrUiffEu7azAhUQASjdDajU7OmzkMzwWB/23P0Dh2JPqcSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645575485; a=rsa-sha256; cv=none; b=IVsDvVIuRu7q2cbJweJDmFDPIzgp5y9uB6zydf1UT9bQQv5gmXtb9ZtZ3KHJ+I3BkaoJ4w GeTk7UyD5zdKlzeMxVBMRt5Im3IPU1AY9kY+liiTNN1ET4SR6gQ7EOPA95CmJxlqi67qwN z4MRIq4xecJGBuNCpHoZUpKosCWCPNrggJCzvLzaxrtlRA9UMNb5V7riO7q9YRyOVOxWro bq8GFzIqZpVLsUSS8lx8uEs9KLyhqTh0ceYd7htorgmtwwqmY1VK3rC0QRELpFtI5hVLe2 bXbRu0uI/OyRIvXTJxKIbOifJBbUwV9AA8Nyu9mcmVRX6+OTM6MCqfGRZ21vTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=153446e530b2b1ceb18c3283c45e265febf8766a commit 153446e530b2b1ceb18c3283c45e265febf8766a Author: Michael Tuexen AuthorDate: 2022-02-18 13:30:07 +0000 Commit: Michael Tuexen CommitDate: 2022-02-23 00:16:36 +0000 sctp: improve robustness (cherry picked from commit fd0d53f85c9f5d1a31367eb1b8b5e74cc83afd52) --- 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)) /*************************/