From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 DD7691FCF41 for ; Sat, 25 Apr 2026 01:42:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777081341; cv=none; b=guw9eWQPXgoSstgsdVlvXRkCO4SFh4napZB2wj1pzlhBDSdACn0lDmpfRsgl/VCraiJuqsXA8zTLaYwgfyz4Jm27LLf274qQhUcFkb1CgZYxv8yahPmT7TWpI5ZlwuUbz79xY9N5JYi2rMLEz8NJlhhne3HDsVNjDLesh1ySAZ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777081341; c=relaxed/simple; bh=mj3qfGYlr+bMveVNY0NmGwQ8Jz+/4iRwZC+w+LJ21Ww=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=A/IIYVdQ93+yiNxOuuaDm+vGIjGL3CzTQjKLZwfdGeLQG7rxcmLzZjDNGaeXzba4sMHUO7Ljgto5Lk2rGMlK/Pv3JI3n2TIr9wfSF8Wuo+Pbuw6heZgrJL7SWS+UiPT12WKAIclBg4Z45+ro4m8+Cc+aHUpAeHADI5fe/9qa7sE= 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=TtNcuHTq; arc=none smtp.client-ip=209.85.216.49 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="TtNcuHTq" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-35da1af3e10so7936411a91.3 for ; Fri, 24 Apr 2026 18:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777081339; x=1777686139; 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=4OxYR+RFt6UrbmMauhFwdJjJ5w7Lq82SA2vzvpVn2KI=; b=TtNcuHTqY8iR0xBAIn/qlkWOiuLT3CMqmKxEL0x6cgAXG7sP0QN2htCPZc5KeZxjE8 cQJy02bNPs+jD5Fh7W7vIO09kChXVTkMcKbrg+uDd1hRPplxoP95eYi+PM7qxgmbUv1S G12G0LI0yVSlb7NZfwhk1ckzgZNGet6Z/UoiTIX1eyB2hD5/xN4+uY+/jNEDeBcQvgci InTnxYPGIvl1gDB+ds1VHXkEt5P9Hb6q7Lb0y5lB6TmL5KFyG0pXlgUpBEGM8Zyovigj waJRvO02yIwlWF9f+cjszwDpdkh0AdnUIg/R5ntxH860gzUOogPREcUzO9ZjFGdCdAOf KRGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777081339; x=1777686139; 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=4OxYR+RFt6UrbmMauhFwdJjJ5w7Lq82SA2vzvpVn2KI=; b=nFhvy0xj1+k30PzwHnlhyqlXVyDr5pCQuLKJ+/s3Gmzt2UKTx2Fh3B0Vcci6x6BQct fHgzQxEGH4cdzneB1H+A//9Z9elahfBR4RWXOmm8hEzQ8JBYSR6rUbfb/IFKCZdlsnRK Zitsn5QijQduSQgwhQrJfiHeBMhEEcICVWHmRMp2ARsju7AAVy6FjiidezIhWEQ0a/9i TKNg5IJc+8Xyf8RkLVUL9rgct1SccQsC5KUYPF1fHAOzTq7K28K6qgKeciFL3d5s+dVZ irCmPd7TT0ud8Z2cEweC6mJVZw2jzH0xVFOjzqhN0OVV97WIZXs3XyGcsJK/2bOUkDqA K/8g== X-Forwarded-Encrypted: i=1; AFNElJ/7PCj/Q+g3kuRighwyxszrX1VCD1jtClIsD6hkH4DzqzzUU0+UKtvakZ+IIurVDt0u8FLsXA44FVNbZ1U=@vger.kernel.org X-Gm-Message-State: AOJu0Yzh2peErOTf6Zgn3KaasEdABySmdcF4qjHumsKQvWtQWq89QJ13 fR4t4/jps6X2OmxesdJ+RucrLBUhc+STzyfo+NTOaLXsmq9/ymjLSs+Y X-Gm-Gg: AeBDievUp/es1zKhd1d11Of+0DCHS/Hjl6cB0gKuiPy9lxGC5zs/ozUMnNCj7E0wwSI j8OI/IDq4nd20b0IUxunHLytwu6jR1EePLPyHhuR67nVOJEnexeXvKNJxZbm5B3/EuvvQ+qfJja 3Q0/HEFNw0O4DV2+90q5yYm6qIXayme7B8HYFBkZNacvyeU6GMXc1/pZdy05eGBJl3WiyKP2qsW XJJWIbQ49rt5h48gspGtd5Zs+82U/LCIzfrPiJz49LKQMwjES4XWB/jlIs9krPwTSdrpq8QXSHm mT+ly3Vn1n3u01esHN/pc8tC9h6p89Yh+sBeKb4hwktG9IQtcaeNaotwFIjAVqlqPXCb2ENpzgc PsMeLMiaJ4QW4vHpcizICwH9FvYZSAy96lt7t+D82e2kF5+kg6a7vp0ntd/FVojR36j3q3vufrT KPz+kpOmNq5WtaNtAdxewaABNPXXkePwoZ2TeMUXScQLFsPS1sI0j2yZV86JnTA9HR2BV/bupbC Gh5HmbsCNGYlmabfdbBoHG3kuw2diShWccW X-Received: by 2002:a17:90b:4fcc:b0:35f:b293:7ac6 with SMTP id 98e67ed59e1d1-361403bd8camr37022135a91.6.1777081339252; Fri, 24 Apr 2026 18:42:19 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-362c69b8257sm9967412a91.7.2026.04.24.18.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 18:42:18 -0700 (PDT) From: Rosen Penev To: linux-usb@vger.kernel.org Cc: Heikki Krogerus , Greg Kroah-Hartman , Kees Cook , "Gustavo A. R. Silva" , 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)?\b) Subject: [PATCH] usb: typec: intel_pmc_mux: combine kzalloc + kcalloc Date: Fri, 24 Apr 2026 18:42:01 -0700 Message-ID: <20260425014201.439251-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.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 A flexible array member can be used to combine allocations and simplify handling slightly. Add __counted_by for extra runtime analysis. Signed-off-by: Rosen Penev --- drivers/usb/typec/mux/intel_pmc_mux.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c index 1698428654ab..e22b070a140f 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -151,13 +151,14 @@ struct pmc_usb { u8 num_ports; struct device *dev; struct intel_scu_ipc_dev *ipc; - struct pmc_usb_port *port; struct acpi_device *iom_adev; void __iomem *iom_base; u32 iom_port_status_offset; u8 iom_port_status_size; struct dentry *dentry; + + struct pmc_usb_port port[] __counted_by(num_ports); }; static struct dentry *pmc_mux_debugfs_root; @@ -731,27 +732,25 @@ static int pmc_usb_probe(struct platform_device *pdev) { struct fwnode_handle *fwnode = NULL; struct pmc_usb *pmc; + u8 num_ports; int i = 0; int ret; - pmc = devm_kzalloc(&pdev->dev, sizeof(*pmc), GFP_KERNEL); - if (!pmc) - return -ENOMEM; - device_for_each_child_node(&pdev->dev, fwnode) - pmc->num_ports++; + num_ports++; /* The IOM microcontroller has a limitation of max 4 ports. */ - if (pmc->num_ports > 4) { + if (num_ports > 4) { dev_err(&pdev->dev, "driver limited to 4 ports\n"); return -ERANGE; } - pmc->port = devm_kcalloc(&pdev->dev, pmc->num_ports, - sizeof(struct pmc_usb_port), GFP_KERNEL); - if (!pmc->port) + pmc = devm_kzalloc(&pdev->dev, struct_size(pmc, port, num_ports), GFP_KERNEL); + if (!pmc) return -ENOMEM; + pmc->num_ports = num_ports; + pmc->ipc = devm_intel_scu_ipc_dev_get(&pdev->dev); if (!pmc->ipc) return -EPROBE_DEFER; -- 2.54.0