From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0314346FA2; Wed, 3 Dec 2025 16:25:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764779123; cv=none; b=KtNyJM0R897lDm7Z44KUV1KcLOyurvRWy57EMZ/ccAGw/H6cff7tIXiZ430IBo860bCniSI7CYiwuGqX7+g+u6FlRn3gMrLZakBrwnzlEfaXnpU5w9Aofflg0C2TPsc+KA6Dl7Q7DixxWxKFrvaCUyX0LZieq4vokYasnWzEgB4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764779123; c=relaxed/simple; bh=FT7+L44qbi9hX6XIqIRc153RjmU0a+k3l1qqapL+UFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DtQ0hVRADSPCkpkWN933Q/VMTpFK5uJx8ICCgqduKRftgKV8NDIeFmuQYPfbRkCMLND3tPLPOcf5aV+34BOOOR8bYc5b0uQc1QWRYMjCUqvb8LfTxsJSd4FIQGQaQB9TqRYUHl3VEpA4NnITCaCECkQ86C7N8S/Gct7cJilKYXc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=r67iCe+4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="r67iCe+4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 728C7C116B1; Wed, 3 Dec 2025 16:25:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764779121; bh=FT7+L44qbi9hX6XIqIRc153RjmU0a+k3l1qqapL+UFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r67iCe+4lSJSPfKVeRcHaydjMy4J5ksr6lLoafQjqAQ8mB/KKAupKiB5MOKRAhpTr 9tpTI4D7lIu2nKR9xNoBlsVyrHZE/FzFfMDRhAum41aku2Mfje86/9J2PoE0IFEHFK la0tBtNHzSaW+Dl3OibzHhXkv9ggSlPZKSdhjxRg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, raub camaioni , Sasha Levin Subject: [PATCH 6.1 161/568] usb: gadget: f_ncm: Fix MAC assignment NCM ethernet Date: Wed, 3 Dec 2025 16:22:43 +0100 Message-ID: <20251203152446.620858315@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: raub camaioni [ Upstream commit 956606bafb5fc6e5968aadcda86fc0037e1d7548 ] This fix is already present in f_ecm.c and was never propagated to f_ncm.c When creating multiple NCM ethernet devices on a composite usb gadget device each MAC address on the HOST side will be identical. Having the same MAC on different network interfaces is bad. This fix updates the MAC address inside the ncm_strings_defs global during the ncm_bind call. This ensures each device has a unique MAC. In f_ecm.c ecm_string_defs is updated in the same way. The defunct MAC assignment in ncm_alloc has been removed. Signed-off-by: raub camaioni Link: https://lore.kernel.org/r/20250815131358.1047525-1-raubcameo@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_ncm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c index ba99f2bce646f..0b12bf0942124 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -1464,6 +1464,8 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f) ncm_opts->bound = true; + ncm_string_defs[1].s = ncm->ethaddr; + us = usb_gstrings_attach(cdev, ncm_strings, ARRAY_SIZE(ncm_string_defs)); if (IS_ERR(us)) @@ -1713,7 +1715,6 @@ static struct usb_function *ncm_alloc(struct usb_function_instance *fi) mutex_unlock(&opts->lock); return ERR_PTR(-EINVAL); } - ncm_string_defs[STRING_MAC_IDX].s = ncm->ethaddr; spin_lock_init(&ncm->lock); ncm_reset_values(ncm); -- 2.51.0