From nobody Wed Jul 02 19:34:39 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 4bXVTX2kxFz60qkm; Wed, 02 Jul 2025 19:34:40 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXVTW4DkPz3bmK; Wed, 02 Jul 2025 19:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751484879; 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=g74sSnLOPrSySfDFbnyFMSuYUHeerm+27cKV3o6vjnQ=; b=AsKpPA7RNfGVizIHSd32WvyJrgZH+iTQ8BebL0Kl/7hxNQO8YBweLtUiLaIxF2rFAUAhn5 sAq41Hm+goCyJBmx9Cia+7ePfg/PqhpxZs8ONgQprDwPCKKOp85ILXNYTReFrIqxwr7X2L 5BY+2PIiURwpPUGPOr1qA+zbNjLOB7ohFEMuTuABYynIIo0FfzQjQ65o+kA9vaQu/TpX1U lpkq3v83yMV/dqtPn7r9Op0GXixiuS+DcwejYTtwdsHUISAtmoMW8P5KWGe4DwxRQdKiR6 KKIPtYiDAYxzwoNsLGfEr1y09J8k3ZvS3j74BAcMv5RkPpD3jkrELahtml+EGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751484879; 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=g74sSnLOPrSySfDFbnyFMSuYUHeerm+27cKV3o6vjnQ=; b=jLkGHUevb8rqW+BMw8RfgBA8kzAtOeijC6ADJMqRGFNNjUz3cviXmNpeCcH+UNUsuDF5WZ 2TxU6K8j5MZD17OR/7fcqlXDnu858z2oIGfZnoHl1iLS5rsoZQrMpbpdfvqFzda7HDUrGe 5KljS5slfDqYm1wDMeo80StekKGUISdHwYp5qmU6s0PlcRbe8WCTL9R6kVmwDUGVL+mvU7 RFyGVt0RimGinWTr0xP23tBBQ9f3sdR8orMmhVO9igDiJ6YOBvCsagKyEaXbd6BZi1YqrF 6Ev+SfNTSek7quk6qpbZVKVEMXVqkXUBlJsHj78nj2Iyop4jkkvWszx8Nz9aeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751484879; a=rsa-sha256; cv=none; b=fYi+Wvr/bBFxB3uAcyoQQjW7rRJnh6WjjbWz3Ya17yvegkZIljiCUJN8W6wy1Tn7N+XrXu wGFD1BHD5DUXN1NiTKumkZWZC+M2m5CFg8Qsg8JyypRVYyNgsWKoIRFZXQuH/NAdbWmdQ0 6tU5Q8KDgQeyIKsNARi9d+qSOgwQCK2RfFeRi2XXGtDBDN/fMis3tZi6YmMVN06UIzDlQz 3Oj3AXW4oPSsqOdquprh2ULkXsVHPWDJEQ9groCSSUz/K3bj8resAQrtsa+bZDnw6FS2km 8pfGlrPbYQ8svCXVWH+VgPjh5i32ApWxbng7shkEskAHjqI4uIE2aO9UQ93bEQ== 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 4bXVTW3GJSzZ1f; Wed, 02 Jul 2025 19:34:39 +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 562JYdIv088989; Wed, 2 Jul 2025 19:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562JYdop088986; Wed, 2 Jul 2025 19:34:39 GMT (envelope-from git) Date: Wed, 2 Jul 2025 19:34:39 GMT Message-Id: <202507021934.562JYdop088986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 604d34c23f77 - main - net: ether_gen_addr: fix address generation 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 604d34c23f772ae0005a552b0b7189f3dc97d519 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=604d34c23f772ae0005a552b0b7189f3dc97d519 commit 604d34c23f772ae0005a552b0b7189f3dc97d519 Author: Maxim Shalomikhin AuthorDate: 2025-07-02 19:25:57 +0000 Commit: Kyle Evans CommitDate: 2025-07-02 19:33:52 +0000 net: ether_gen_addr: fix address generation Some errors in ether_gen_addr() caused us to generate MAC addresses out of range, and the ones that were within range had other errors causing the pool of addresses that we might actually generate to shrink. Fix both prblems by using only two bytes of the digest and then OR'ing against the mask, which has the appropriate byte set for the fourth octet of the range already; essentially, our digest is only contributing the last two octets. Change is the author, but any blame for the commit message goes to kevans. PR: 256850 Relnotes: yes --- sys/net/if_ethersubr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index cf697089708c..7be4dfac23e7 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1510,9 +1510,7 @@ ether_gen_addr_byname(const char *nameunit, struct ether_addr *hwaddr) SHA1Final(digest, &ctx); free(buf, M_TEMP); - addr = ((digest[0] << 16) | (digest[1] << 8) | digest[2]) & - OUI_FREEBSD_GENERATED_MASK; - addr = OUI_FREEBSD(addr); + addr = (digest[0] << 8) | digest[1] | OUI_FREEBSD_GENERATED_LOW; for (i = 0; i < ETHER_ADDR_LEN; ++i) { hwaddr->octet[i] = addr >> ((ETHER_ADDR_LEN - i - 1) * 8) & 0xFF;