From nobody Wed May 25 08:31:18 2022 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 D3BFE1B47D68; Wed, 25 May 2022 08:31:18 +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 4L7PRV5ZLQz3vDC; Wed, 25 May 2022 08:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653467478; 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=/+k0xNZnHWmQtGdohcie65TAQj18xU6KSvRjYi/PKKY=; b=qeL4ULaN/QlxviLsa0ulREvyOFny1tJadmSZKCBCXVgchqgau0d+uRS2JPC2H8amj73Nw7 3ceC0jtAQouYJxcHSdB0g051NiQ+z0c/CZTOF81acjbpupKFO51tMBcaPxfgCgq+UmVT1D NhlXTcJtVtwB1ESdHfB5PL7ZpV7yEURDA+7eFIqTtnH56UmtlIM1gDbsDILdu2Eiu0SUzL ArMG4TY+539FO8Xx924OxVgltEo7/VBl/Nz7qCCfUCnx11suI5lSHkmTvscYR1Jdg2W+BL EZYnJ42NYFjOnd8MNivUsYd89FUTeK3cn0Sn9CXXjWnR2QOnRewpSiJc4rImQA== 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 A069815CA7; Wed, 25 May 2022 08:31:18 +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 24P8VIHs075760; Wed, 25 May 2022 08:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24P8VILi075759; Wed, 25 May 2022 08:31:18 GMT (envelope-from git) Date: Wed, 25 May 2022 08:31:18 GMT Message-Id: <202205250831.24P8VILi075759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 94cea2fc0761 - stable/13 - rtsock: fix a stack overflow 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 94cea2fc07611a2f74641b4cac8c4d245826f5f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653467478; 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=/+k0xNZnHWmQtGdohcie65TAQj18xU6KSvRjYi/PKKY=; b=S8eKjZh6GkEr7qUGF1TAyId5wtdWVJWdblmE9jnt+SIaYhsnmg9tX37uRtXxhaR59vN2qC jdKxsoQBG8yPyRzAA4Q1wSc1geF9G0yyUdHLjPj77m0hErZZ+mLu2Lyq6dR6RHbkgmIV2t 5uAPrhtdW4fdSxKjAIDqhpMRsWxxd6DZLiCKxrmP2a6Z9j+hamidoD4TcxRqvT2d1wWE4E zeilyXjjBJpXwhnKIKWt+zhNxMMwr9mo1Q0LGqKxOzevRis7/sRzMpq20YcytVRB0o+mqj JrWpmLHjmUniCZozTZmseFIBJOwWJ4MSued/dVNkGpyF6PD0nBIiXQLAW1JBJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653467478; a=rsa-sha256; cv=none; b=bXUx3dbOZK7B2LRt7KJCV1eoTPjwUf88ijww8WrHOTFm4yFjoWwXxf6FDcbQCmIyPKhQ9t Z+4TExV4xd7VNvqt6q9AB1mKsLuf3vyE2iKCMOfbnHA2ZyabHLCc5sWVZs1h+uFvzEIWf5 DyiKCqmL5BUlCvycQVmAKxpTwlsb6Ok8o0O+Jrt2uUrdy8zHP3OZ3POp7OQI6zfz7V0bAA WHQV0aNsTp9GZt+ocxtFTdhqilxEKhNo4yKOJxcQsKHZgwCqXceaHrircHVrR5Bim5gENj rTVQhQa8Mx8gRxUng2MRIFG6LLj45SYCVvijpWuGqsOSdylvpPVbVdeOc+/+ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=94cea2fc07611a2f74641b4cac8c4d245826f5f7 commit 94cea2fc07611a2f74641b4cac8c4d245826f5f7 Author: Kurosawa Takahiro AuthorDate: 2022-05-13 17:58:11 +0000 Commit: Kristof Provost CommitDate: 2022-05-25 08:13:34 +0000 rtsock: fix a stack overflow struct sockaddr is not sufficient for buffer that can hold any sockaddr_* structure. struct sockaddr_storage should be used. Test: ifconfig epair create ifconfig epair0a inet6 add 2001:db8::1 up ndp -s 2001:db8::2 02:86:98:2e:96:0b proxy # this triggers kernel stack overflow Reviewed by: markj, kp Differential Revision: https://reviews.freebsd.org/D35188 (cherry picked from commit 9573cc35555eb0da35da5712462de9f6107fb974) --- sys/net/rtsock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 1f898c739725..5f386a2142f6 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -788,7 +788,7 @@ handle_rtm_get(struct rt_addrinfo *info, u_int fibnum, * TODO: move this logic to userland. */ if (rtm->rtm_flags & RTF_ANNOUNCE) { - struct sockaddr laddr; + struct sockaddr_storage laddr; if (nh->nh_ifp != NULL && nh->nh_ifp->if_type == IFT_PROPVIRTUAL) { @@ -798,17 +798,17 @@ handle_rtm_get(struct rt_addrinfo *info, u_int fibnum, RT_ALL_FIBS); if (ifa != NULL) rt_maskedcopy(ifa->ifa_addr, - &laddr, + (struct sockaddr *)&laddr, ifa->ifa_netmask); } else rt_maskedcopy(nh->nh_ifa->ifa_addr, - &laddr, + (struct sockaddr *)&laddr, nh->nh_ifa->ifa_netmask); /* * refactor rt and no lock operation necessary */ - rc->rc_rt = (struct rtentry *)rnh->rnh_matchaddr(&laddr, - &rnh->head); + rc->rc_rt = (struct rtentry *)rnh->rnh_matchaddr( + (struct sockaddr *)&laddr, &rnh->head); if (rc->rc_rt == NULL) { RIB_RUNLOCK(rnh); return (ESRCH);