From nobody Tue Apr 7 19:49:29 2026 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (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 D0D2938D6A5 for ; Wed, 11 Mar 2026 23:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271448; cv=none; b=IgjqglTg4Sbni/y+0pkrhQsd1aK5UVQRZZXtcP3c3p6of/PbX8KSqiGiiWNC0FgY6UYqIypxKcfRJNBk0khQVORTClzBlw2ji69Bis4Y3J267yzSU+cQxwZpCeRopTiToRCA0alk9O8Y8vr66DAZ9SYWiNJ0OjiIo6V86DTd4Yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271448; c=relaxed/simple; bh=5x6P8nJwDE2dMBktvCxCL7MxySCiJKpx1mSlB5k2l7A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Osa4uTiIbx0I4OQkgZ8lSVkHVT2YtbUeqyuFRNzfkKVwTkBdnWcA1azDWN5E7Hip5U27sMAD0IRpmjh5hneGfvuO7bED7q1b20agDhTARFxhaOc0HcYU5382fd7bQK9U9N/7p5at+Fu9MVJt8z4GZ1+AFdQp5EYFkVIQA7GyyxM= 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=FVHIAo0O; arc=none smtp.client-ip=209.85.215.174 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="FVHIAo0O" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-c70c112cb61so225137a12.0 for ; Wed, 11 Mar 2026 16:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773271446; x=1773876246; 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=KKV6gzPWKf+kdTy1HFMh1iXAwf/N5tjFhknniuMmlF8=; b=FVHIAo0OTs0xVexbwy8CQFqCNz43JIoI8zD5/kMBuvUv/Qtx6KDiuyccMFCsOObpLR lOdbab3AV0RzpzOhjtEb3coKW2qnXwLNeGfdfybix5L7itKGndSKgEZVqMLqF3LyhKYr 2EzPsB9to0k/DRdt9dwYEL1uSRSyLHYJrHpewDJVrfIaVtaMBYQg4yBo9XW8rEgY+Vsp EnZV4HYG/O2bTlHbbzeFZa3qK9w6GljdVKpWTe+8UTSJrqm+KlDIftMQeCbFPS57ag3p MKEDDP+lS5AM3rUpoY10oLWXLW/tpjK7af5E4Vdsgt7SQIVdpyF466IjaXCRsJaoOjxk yV3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773271446; x=1773876246; 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=KKV6gzPWKf+kdTy1HFMh1iXAwf/N5tjFhknniuMmlF8=; b=g3wG8lwcjmdTI+bxp6teb8/kZHGigGFKaeQ/qBS4+IPB+i68FRfEITjxAPqwJsHB/D DEuBiWinpCiOr+WamqbUJCN8p3XOUiE2BdZHnHtgeb40YXcpyEAFXVfwAW8Kn0vlP3GJ qi+b99bLRzWLp9C3HV+7dQEV2QJ4xCjYbxzg85qU0PWdZu/tc91avP0Z+25hKJL82K4j HC+kr3mYLkPVsVg4eedTOyLoOB0gZYwVHY2fONdI6aO3/FBYko+a2xlD8N5A3wGzKE0v r+NHCI5hwp3O9pg2KQaxdSXhxpcmx0iyq9NeWju0WF9vsQ22SgSgwWxJDvVIV4XtkLF3 rzkw== X-Forwarded-Encrypted: i=1; AJvYcCWEoqZxH1TeMQUVpmlrLKD6+6QA1oYEB0tya0kpbb5ncRtEWHlazC8dS7GLziQ4zb8FbTl06ji3UT9n9hM=@vger.kernel.org X-Gm-Message-State: AOJu0YyXuqgVIvOt/JZi4nar72UsmLb604ye2J3hlBJYOufRu34AaF1L GwJp05Sh5f8ppXFGfCs0bTtKss3dn2g1ri7X9dRdgLbS3x7/mxvQg4GJ X-Gm-Gg: ATEYQzyz+C7yZ/OiqujjlZE/gfjuBO17gzOMxdFCA3eSS1Vg4f8BDdDz9G9cD9LFkgI u8y7QTjQAasVUCIcRVSBR3AlqRhLgkrLBSPwLO98QGSQfxAeKrIDLTphzvSBGPzJILbOkwY4NE2 0mrWErSukbaSIRmJmt8YQoVSOrPeMinuFvsAuC08eVko+9MPYqEQ3qK5dD0YTLHiX25sVeUeWzT DvzgrybpyR4y4O5U//0epSetEtAsy8AZTTstDaCPNr4/8uT5VuTJfyyC9QYXO0jA0dRk5RLyair RTHR8tn5D40ADrhtDSdqoVEHjA0GjtpozKV1fX8bcsxfFSIhda3K+qasc8RmuD7iT+6tANr9n3G oqW3Tu5vIZdxk4weJnStttDa6BIca00GHtMCwcpUZPi65z3kzhongGgJluRZlj6d9TG+7in6BXZ hMROpTomUppwMAaZ6fe/4N/Uur91WfimkHdCGqAJrArLdMGaTo2feWte5naMATFXue X-Received: by 2002:a05:6300:6705:b0:398:7667:b2e5 with SMTP id adf61e73a8af0-398c6178160mr3760195637.68.1773271446144; Wed, 11 Mar 2026 16:24:06 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a072603c0sm755037b3a.22.2026.03.11.16.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 16:24:04 -0700 (PDT) From: Rosen Penev To: linux-usb@vger.kernel.org Cc: "Bryan O'Donoghue" , Heikki Krogerus , Greg Kroah-Hartman , Kees Cook , "Gustavo A. R. Silva" , linux-arm-msm@vger.kernel.org (open list:QUALCOMM TYPEC PORT MANAGER 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)?\b) Subject: [PATCHv2] usb: typec: qcom-pmic-typec: simplify allocation Date: Wed, 11 Mar 2026 16:23:47 -0700 Message-ID: <20260311232347.18257-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Change kzalloc + kcalloc to just kzalloc with a flexible array member. Add __counted_by for extra runtime analysis when requested. Move counting assignment immediately after allocation as required by __counted_by. Signed-off-by: Rosen Penev --- v2: reduce chaanges only to needed ones. .../typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 23 ++++++++----------- .../typec/tcpm/qcom/qcom_pmic_typec_port.c | 22 ++++++++---------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c b/drivers/= usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c index c8b1463e6e8b..a1d9315994de 100644 --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c @@ -95,13 +95,13 @@ struct pmic_typec_pdphy { struct regmap *regmap; u32 base; - unsigned int nr_irqs; - struct pmic_typec_pdphy_irq_data *irq_data; - struct work_struct reset_work; struct work_struct receive_work; struct regulator *vdd_pdphy; spinlock_t lock; /* Register atomicity */ + + unsigned int nr_irqs; + struct pmic_typec_pdphy_irq_data irq_data[] __counted_by(nr_irqs); }; static void qcom_pmic_typec_pdphy_reset_on(struct pmic_typec_pdphy *pmic_t= ypec_pdphy) @@ -560,18 +560,16 @@ int qcom_pmic_typec_pdphy_probe(struct platform_devic= e *pdev, struct pmic_typec_pdphy_irq_data *irq_data; int i, ret, irq; - pmic_typec_pdphy =3D devm_kzalloc(dev, sizeof(*pmic_typec_pdphy), GFP_KER= NEL); - if (!pmic_typec_pdphy) - return -ENOMEM; - if (!res->nr_irqs || res->nr_irqs > PMIC_PDPHY_MAX_IRQS) return -EINVAL; - irq_data =3D devm_kcalloc(dev, res->nr_irqs, sizeof(*irq_data), - GFP_KERNEL); - if (!irq_data) + pmic_typec_pdphy =3D devm_kzalloc(dev, + struct_size(pmic_typec_pdphy, irq_data, res->nr_irqs), GFP_KERNEL); + if (!pmic_typec_pdphy) return -ENOMEM; + pmic_typec_pdphy->nr_irqs =3D res->nr_irqs; + pmic_typec_pdphy->vdd_pdphy =3D devm_regulator_get(dev, "vdd-pdphy"); if (IS_ERR(pmic_typec_pdphy->vdd_pdphy)) return PTR_ERR(pmic_typec_pdphy->vdd_pdphy); @@ -579,12 +577,11 @@ int qcom_pmic_typec_pdphy_probe(struct platform_devic= e *pdev, pmic_typec_pdphy->dev =3D dev; pmic_typec_pdphy->base =3D base; pmic_typec_pdphy->regmap =3D regmap; - pmic_typec_pdphy->nr_irqs =3D res->nr_irqs; - pmic_typec_pdphy->irq_data =3D irq_data; spin_lock_init(&pmic_typec_pdphy->lock); INIT_WORK(&pmic_typec_pdphy->reset_work, qcom_pmic_typec_pdphy_sig_reset_= work); - for (i =3D 0; i < res->nr_irqs; i++, irq_data++) { + for (i =3D 0; i < res->nr_irqs; i++) { + irq_data =3D &pmic_typec_pdphy->irq_data[i]; irq =3D platform_get_irq_byname(pdev, res->irq_params[i].irq_name); if (irq < 0) return irq; diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c b/drivers/u= sb/typec/tcpm/qcom/qcom_pmic_typec_port.c index 8051eaa46991..6c6401187f58 100644 --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c @@ -169,8 +169,6 @@ struct pmic_typec_port { struct tcpm_port *tcpm_port; struct regmap *regmap; u32 base; - unsigned int nr_irqs; - struct pmic_typec_port_irq_data *irq_data; struct regulator *vdd_vbus; bool vbus_enabled; @@ -181,6 +179,9 @@ struct pmic_typec_port { struct delayed_work cc_debounce_dwork; spinlock_t lock; /* Register atomicity */ + + unsigned int nr_irqs; + struct pmic_typec_port_irq_data irq_data[] __counted_by(nr_irqs); }; static const char * const typec_cc_status_name[] =3D { @@ -706,18 +707,16 @@ int qcom_pmic_typec_port_probe(struct platform_device= *pdev, struct pmic_typec_port *pmic_typec_port; int i, ret, irq; - pmic_typec_port =3D devm_kzalloc(dev, sizeof(*pmic_typec_port), GFP_KERNE= L); - if (!pmic_typec_port) - return -ENOMEM; - if (!res->nr_irqs || res->nr_irqs > PMIC_TYPEC_MAX_IRQS) return -EINVAL; - irq_data =3D devm_kcalloc(dev, res->nr_irqs, sizeof(*irq_data), - GFP_KERNEL); - if (!irq_data) + pmic_typec_port =3D devm_kzalloc(dev, + struct_size(pmic_typec_port, irq_data, res->nr_irqs), GFP_KERNEL); + if (!pmic_typec_port) return -ENOMEM; + pmic_typec_port->nr_irqs =3D res->nr_irqs; + mutex_init(&pmic_typec_port->vbus_lock); pmic_typec_port->vdd_vbus =3D devm_regulator_get(dev, "vdd-vbus"); @@ -727,8 +726,6 @@ int qcom_pmic_typec_port_probe(struct platform_device *= pdev, pmic_typec_port->dev =3D dev; pmic_typec_port->base =3D base; pmic_typec_port->regmap =3D regmap; - pmic_typec_port->nr_irqs =3D res->nr_irqs; - pmic_typec_port->irq_data =3D irq_data; spin_lock_init(&pmic_typec_port->lock); INIT_DELAYED_WORK(&pmic_typec_port->cc_debounce_dwork, qcom_pmic_typec_port_cc_debounce); @@ -737,7 +734,8 @@ int qcom_pmic_typec_port_probe(struct platform_device *= pdev, if (irq < 0) return irq; - for (i =3D 0; i < res->nr_irqs; i++, irq_data++) { + for (i =3D 0; i < res->nr_irqs; i++) { + irq_data =3D &pmic_typec_port->irq_data[i]; irq =3D platform_get_irq_byname(pdev, res->irq_params[i].irq_name); if (irq < 0) -- 2.53.0