From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A11501CEAC2 for ; Fri, 3 Jul 2026 22:03:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783116192; cv=none; b=ANWWOVg4s1fwxv8uA2x1A4lgHdKwTN9w9jvt45fTM+tqUjj4rBUQa6kRi3KDZDQCscdTwSDzg/Re602hx3MxdnAgGcCVIjyEw7CLpBta996RBHqUQNWgL5SSbBWn42jqwj9Ed+LfzLTq4gGiaY/B2OWmr6joWgDpUxrpNVG+t1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783116192; c=relaxed/simple; bh=5VkVa/bfQQlD4FNDyJGe3VFIzh2ZdEhPVb+nD/ImeDs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mlyouQhEQxzuLCRnRV8HrigfErJZFJMWnglHGziPVCTLHfjSYx6vZK4gbGnRah/L/pGsFhHlGWiSM6At6jdYKhJ62UvvIWSpmaT+PBzHX2w6BXTLNJn70RePf8SGpyhxyV7f9WKzDa1Z1jFDhBM2P39qQE8CkAP02K3j/TsoV/c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RmTVknSK; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RmTVknSK" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2cace91f112so7732515ad.0 for ; Fri, 03 Jul 2026 15:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783116191; x=1783720991; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7TiflaSmlDHD5QUweyOWTNN1cwlytjiZ+cyZbaPXtE4=; b=RmTVknSKKitbY5ap6hXuc3iM81A1D/wuqulP6whzjopM5dArDZxo1NGH+m7JJaXo0u z73Dv8OXTZaOwGAR/l3UPH7BBFBqJU0amQYUdF4QyzGwSXgDFmuJkjgbRV4wRhNrRVR/ M660Ni3Ur4S3YXXk7DXerp212jz6HNl8p5WiAsGun6KQOQwYj824GovLrpzx5dYl5A2z byNbh8PHk6k7KaOHMcwItnXAG8LvML+UGr45TQPMnjwXEgqstXVKL5v8BXsgB/cl3q7n tZSMBgSkjUtTL3qhksio7c2MtrcyhQDMGvSUoiN4E5BZH2fuCs20TDZQFsllixjfTj7P CJwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783116191; x=1783720991; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7TiflaSmlDHD5QUweyOWTNN1cwlytjiZ+cyZbaPXtE4=; b=TDRBdJeIkBkb47KqsC+dhXGh8T1koJEbpHJSk7xSSuQ3lthYxaUCgzb5UKIL2jaGMj MDAk11WZMAuEJRKdN6Is+mz/eIL0E5aJQgElzxFhPzZ64rDkboQoGvuEYHDDJ44Dtorv xGr+0lhvTx4qw05oWC0iG8MAtU7YkZCEg8T+Hucrcio7xnCfJq5+SS6NamDMVtwcCHiL awbu6T7RvZrCPQ6fZdv7h+Q3rIRodbzGtdL1owdtEIH0A5cHiH5SW9BekIyTbDY6B3gl T4ooWBAtOzBwXWxpfVRU8p0C0/CvbR1daxXmT5ivyCm/weyPLlcF13G3rYSqIzmr2i9A xJ7g== X-Forwarded-Encrypted: i=1; AHgh+RoYWaMuZv3pNY7hNxNrZPsbUdcB4MRVu7pzcEIc7u3IqtX18XbBOZgBtsaqgm1myLQow1zdYh9nigeBbV8=@vger.kernel.org X-Gm-Message-State: AOJu0Ywyik77XfcoCBc0Fs7qNr7dvO7P9RfvJxRtLjMvVKjMPc8rCSPp mh+A4iuzAyAWnZmqkjzJ+4WtjG9Ddq/8SSF9OZuAj4Ph7r2GAjowDTMu X-Gm-Gg: AfdE7cn5z1AJFlixGXuaThSoeVfv72xsIaa7yaSFtqTgev4ig1nBgakaJZ5enGtKwwy j5pgG87ma+UoN/mO9IsSquYlyUkW2/5vBktQ03qmnCFsR/Q40UdoFQ868xaaEoKFPxNyKtGT4YQ IwmM96WQ1G5SrueFrAqADoDxf2tejRwcIuxClRTnsOP3fngPLMjAyL8QfF8zL7aEpA4j4MQCEnO IlS6ivytEqdHbxbFcirM+t/SJmYyzhrKI46YSr5DOSrfCDwei0pZEokNN51miNAyX03PwR5SBKS fKcPhhjWw0onBEOAvDJ0wOT2YTiD6Y2rP2OeQ+UQKBOOxTBKhP653dTB6oa9XKfRNb92gIXMc2v 1EAGvtUSSQ/bo6a7pWJNHnz8ed9B2O7MF6O6y0Nn7oDoGiLXee6t+Y5PozNPA4gOvj4a9NWCYMg d3MZq+hWX9iyEksbHNVU8A51aDE//aEDgEkHNtmVUlT5p7RK58JpKuAMJ4n4tuR+qNM2SmsIjRz BSXI2KM2w== X-Received: by 2002:a17:903:3bcb:b0:2c8:1f56:9fc5 with SMTP id d9443c01a7336-2cbb9ec70a6mr8823645ad.35.1783116190489; Fri, 03 Jul 2026 15:03:10 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cad77657cbsm14598455ad.47.2026.07.03.15.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2026 15:03:09 -0700 (PDT) From: Rosen Penev To: linux-usb@vger.kernel.org Cc: Chunfeng Yun , Greg Kroah-Hartman , Kees Cook , "Gustavo A. R. Silva" , linux-arm-kernel@lists.infradead.org (moderated list:MEDIATEK USB3 DRD IP DRIVER), linux-mediatek@lists.infradead.org (moderated list:MEDIATEK USB3 DRD IP DRIVER), linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be|_ptr)?\b) Subject: [PATCHv2] usb: mtu3: allocate phys with ssusb Date: Fri, 3 Jul 2026 15:03:08 -0700 Message-ID: <20260703220308.294247-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use a flexible array member to combine allocations. Slightly more efficient to have a single allocation like this. Add __counted_by for extra runtime analysis. Signed-off-by: Rosen Penev --- v2: add max() call to prevent negative values. drivers/usb/mtu3/mtu3.h | 2 +- drivers/usb/mtu3/mtu3_plat.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h index ba5a63669e5f..d71849388602 100644 --- a/drivers/usb/mtu3/mtu3.h +++ b/drivers/usb/mtu3/mtu3.h @@ -252,7 +252,6 @@ struct ssusb_mtk { struct mtu3 *u3d; void __iomem *mac_base; void __iomem *ippc_base; - struct phy **phys; int num_phys; int wakeup_irq; /* common power & clock */ @@ -272,6 +271,7 @@ struct ssusb_mtk { struct regmap *uwk; u32 uwk_reg_base; u32 uwk_vers; + struct phy *phys[] __counted_by(num_phys); }; /** diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c index cc8a864dbd63..afb01b76e1d7 100644 --- a/drivers/usb/mtu3/mtu3_plat.c +++ b/drivers/usb/mtu3/mtu3_plat.c @@ -240,17 +240,6 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb) if (ret) return ret; - ssusb->num_phys = of_count_phandle_with_args(node, - "phys", "#phy-cells"); - if (ssusb->num_phys > 0) { - ssusb->phys = devm_kcalloc(dev, ssusb->num_phys, - sizeof(*ssusb->phys), GFP_KERNEL); - if (!ssusb->phys) - return -ENOMEM; - } else { - ssusb->num_phys = 0; - } - for (i = 0; i < ssusb->num_phys; i++) { ssusb->phys[i] = devm_of_phy_get_by_index(dev, node, i); if (IS_ERR(ssusb->phys[i])) { @@ -330,12 +319,18 @@ static int mtu3_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct ssusb_mtk *ssusb; int ret = -ENOMEM; + int num_phys; + num_phys = of_count_phandle_with_args(dev->of_node, + "phys", "#phy-cells"); + num_phys = max(0, num_phys); /* all elements are set to ZERO as default value */ - ssusb = devm_kzalloc(dev, sizeof(*ssusb), GFP_KERNEL); + ssusb = devm_kzalloc(dev, struct_size(ssusb, phys, num_phys), GFP_KERNEL); if (!ssusb) return -ENOMEM; + ssusb->num_phys = num_phys; + ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); if (ret) { dev_err(dev, "No suitable DMA config available\n"); -- 2.55.0