From nobody Thu May 29 13:09:51 2025 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 4b7RYC40Tqz5x12J; Thu, 29 May 2025 13:09:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7RYC3BVnz3fZF; Thu, 29 May 2025 13:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524191; 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=T9d/p0MgL1tKZNM9CBslxzgiEEdnAeDXaj2z38iZiv0=; b=wOUEqgxyHAA/Rl+slqWpzk7pXV1wK5p/Ql/NWHRMUlnu6PsrWLur0I/glsiJPPd3KjCcg/ iUq9FHXoWlSpr8fa1idekoPHxv37DfMDzueuyEFcPBTUmFtu0dJRYgUANk7jukIkOYAb8O fK407SDQLWFQox7NPJDMG+ZW2nmZ+GsGXMJV/jdRzgr53dsdQiZatwPnPh/Jf4Yvw0tY4t MEhn38KEBY79ILRxK+FF7+a3LdA+C5BHlkrmYdNVZTYbM2mCflhwU9WixxEIjW3jkdclhz dbz3qmM1rJv4q6uoCFvg8iCTuQjLN7JH4hnwA0ZawX3yvccAluduOGSeaZHi0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748524191; a=rsa-sha256; cv=none; b=IOZFYlNmT+OEA2TOUJHvGkIRa9eDe9K9oGwfsDANvklk8C/1u3ovLy1H2gHxyqMksNvumf CtgEno7tNtucs4uhCGpLr+jT+yiq0o61bK34K+zmUxfZsONOcVLlu/y0WBu3zWA67mYvYH tNlBQj7IUZqwCgnQQOHgT6b0rPigYXDv+wMJnnCfQt2znBTJWE8sGq/Qf1SDYzQHyjvnz/ luHAiXGytbE2axMFIABYwWrTzC4q/shXFepdQAS3Mi6DL7i5UVt+h/jm2PAluFSC7LTpOS pErAYOAZRBoeJD5kBxzd9SdIvKSgvV9+2TOo5x2fp30nvgcXoArbiF0hmmo9Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524191; 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=T9d/p0MgL1tKZNM9CBslxzgiEEdnAeDXaj2z38iZiv0=; b=xAIS2LCu4jvbqBo0oZRz56yuEOyjnH/Gtd7hxgjCxtYR/7K1dmjfEcJaDsPxf4ZDXMb/8I KJqym4WMF0UgOJuTcpG10xPIhaV0oiMAF4MSimr4nKtkzmGvqIhvJTt/+AH2a8CAA2BIwd syeQUI7w99nQQp4Uw0h+WjymAJqPLaJrOQc0ZakMbU87I+G4yOfqY0TiWH7hqTMtuMbKFJ 8t+1meng05NxwE0vkKvpDYGECkih9JTmbbGgSi29Yv4mjgsov9G87TXrJu0j+iP6n10m3C B+UYkqbyZusfd/6QEnqwxXKuEmENTeA5uedTpHFHpUazkzm1dIc2lHvoozAQkw== 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 4b7RYC2nS5z1MWm; Thu, 29 May 2025 13:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54TD9p2T061595; Thu, 29 May 2025 13:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TD9pqe061592; Thu, 29 May 2025 13:09:51 GMT (envelope-from git) Date: Thu, 29 May 2025 13:09:51 GMT Message-Id: <202505291309.54TD9pqe061592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: 5ed36e2e1729 - main - umb: avoid buffer overflow in umb_in_len2mask() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ed36e2e1729d6a49a65366c03fc15515967ae67 Auto-Submitted: auto-generated The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=5ed36e2e1729d6a49a65366c03fc15515967ae67 commit 5ed36e2e1729d6a49a65366c03fc15515967ae67 Author: Pierre Pronchery AuthorDate: 2025-05-26 23:18:53 +0000 Commit: Pierre Pronchery CommitDate: 2025-05-29 13:07:52 +0000 umb: avoid buffer overflow in umb_in_len2mask() len comes from ipv4elem.prefixlen in a MBIM_CID_IP_CONFIGURATION message from the USB device, and should not be trusted, as it could be any uint32_t value. Without this extra check, a potential buffer overflow could subsequently occur in umb_in_len2mask(). Fix from Gerhard Roth, after coordination upstream with OpenBSD. PR: 284904 Reported by: Robert Morris Approved by: philip (mentor) Sponsored by: The FreeBSD Foundation --- sys/dev/usb/net/if_umb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_umb.c b/sys/dev/usb/net/if_umb.c index 9b2b504cfa6b..50f481973be0 100644 --- a/sys/dev/usb/net/if_umb.c +++ b/sys/dev/usb/net/if_umb.c @@ -1753,7 +1753,8 @@ umb_add_inet_config(struct umb_softc *sc, struct in_addr ip, u_int prefixlen, sin = (struct sockaddr_in *)&ifra.ifra_mask; sin->sin_family = AF_INET; sin->sin_len = sizeof (*sin); - umb_in_len2mask(&sin->sin_addr, prefixlen); + umb_in_len2mask(&sin->sin_addr, + MIN(prefixlen, sizeof (struct in_addr) * 8)); mtx_unlock(&sc->sc_mutex); CURVNET_SET_QUIET(if_getvnet(ifp));