From nobody Thu Apr 2 18:53:27 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 6AE79221540 for ; Fri, 27 Mar 2026 02:55:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774580153; cv=none; b=WIEoxAFGJC1mtgYPrtgAYXUb/rQrUUguERLyOWMUYCPUbyOhDAPnHF+5HGuBYwFkgCOhpcBMum2XrrtwPjpdh6+YbabfGJKbMjSJE69Qli2h+Xux4InheMoEfD7Vl/+jVULyGLTwBYABDH/WwuMbFCrLeDsVgDYuOVlR/ZtIeKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774580153; c=relaxed/simple; bh=iINfrVicT0U5ezZ3pE2giAjTHpsPII0vZlDnVZgk1BU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=s2ExR8KlOCW5WihHNE/aYy+e2Pl5n8gUS0jOciLC7xtw7uMs0XdTjj5mZynOHQOXq5z3e4u6FNKUt+inf4zeuba/SQPyXw/JNafUM+cMrSRs6ZwsYzaY6Xht6JgkQoKfsstfXgNv6zoBCNsp+17brEhrTopBGDpn7GHj91XwnGo= 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=awCdkszt; arc=none smtp.client-ip=209.85.210.172 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="awCdkszt" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-82c20b9fb16so757258b3a.0 for ; Thu, 26 Mar 2026 19:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774580152; x=1775184952; 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=jxOcLQAL828r9gNJF4VDxn22m5oC9wjYM2C1LJJwNlw=; b=awCdksztQSH1m9srS8WvlXY8s8eMij47LZRcVIjbHnQ8BKPJzn0vV1Qojw4yfAwLnY tDqsJ39RdPE7G3c+OFLqlsOnkFUpjjKs0wNJmS/fJd8izXibn0gJgjEN6djJdHoOngJj pSBlQaYJOqTCOG+m+erYfjyoTKPI3Mq71ovQBKNkZL1I1riy7C0QYPJ20mRjqZ+BqEHP X9uqOvdUbcXhQChS9crtdoprifBhLkKEn/Ki4fIEmNjehDgH4q4NwhBZIldOCmKl6fyH Lm0K9jspV/w63AvgEh0i4lrNK7XDh0h4G8PMzuDgaQokaj1awJ9xr5qAETqRUrX52gsh FtPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774580152; x=1775184952; 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=jxOcLQAL828r9gNJF4VDxn22m5oC9wjYM2C1LJJwNlw=; b=mAfTz3en6HnJo6ncYV8NV6T5R69nto9ZQ0fWq1Ux2wC7rmbUyJk23JZLB6OeYvoPAa OZ65aQTyaNUkOAHt/kVym8jSjTUDCHGYzJHDoHxJGf6hXjJ1CPnr4k+bEsl0E3ptBD6J RZ9GMIfEah7a/rFqT51xuzGbZi1Fsy2dYOX705NlCDeWuBdcIGLmhR2bqt/PHVEv1Ca/ cgSruHiotGEaTj35c2hAePwqtf51jyR/pLlpanPco+qPSY18f+VoUsE+u5smJSNlAkBZ Rz+EFZZLqDDstzX2b9kZkK9Ae4CZY6bAmXDahJ+eBENLNzYJvOA3DUSRer2ziO8symXR /JpA== X-Forwarded-Encrypted: i=1; AJvYcCXTKBOYC2Dd0KTTpSHWjQKl5F0c0iY5TR7q24zp142dJu6YFtE7VH3Gtd+SKoG4LnT7yoRmpe9w8UU7WiQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxrLdSFiOi0nQuIAl2z+n/FqGXan/NJtEN3vi+WY0CSpHDJ11ne EBU4bfg6ao/Jyey8cXuJaAzSv652VjTwXvQ/G67KcvmssQSKtIcBh75R X-Gm-Gg: ATEYQzyhMYstyQ11Pul8VfwmpCT6m8QPAzmlotFBJM5O5CMaTLt2Hc3CLUpKN3mTOC9 hxSltNDfSUow3gUA1iNkuxhkzbyR0e86QsdpxRgcpy+YR6q8t60Q4FO1xFfgZoH7iIV3g1CiPe5 0o0frQKPlYkGuwQ0IUldC5Spo/sd3RyhjvsD44cIBlsSV02SWytsDmqLqSNttiy5LEyxEl5FHAy QjQO+XYnGKOrais/Bk8U4ngRi+QQ4EYmilZmccxs4xD4NqF9Ys2RvVp1jyDgEBdntkmB/tRQhwI /Ou+wY6oURMeaGS7P4uUPfzsZBXVaFzVxGu4A+blDbrtaNS+0+kXcpAG9MbRPVWJR70p2zgvhSj hYxhXQF/lg4rIygjNjruMbNlJ6tmS9AHiIBVw5Qq2dcESmsPcaX+XQVTDEgLfEFGGOj/UQtpH/4 GY8cmsqMjnY0iXHnIjuhRCR9wtQp1tY3k2+a2owVZPAJeS2eCcB7JArgE= X-Received: by 2002:a05:6a00:3e21:b0:82a:7f1a:758c with SMTP id d2e1a72fcca58-82c95c27a26mr779771b3a.11.1774580151840; Thu, 26 Mar 2026 19:55:51 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82c7d1e63b6sm4205803b3a.12.2026.03.26.19.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 19:55:51 -0700 (PDT) From: Rosen Penev To: linux-arm-msm@vger.kernel.org Cc: Bjorn Andersson , Konrad Dybcio , 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] soc: qcom: wcnss: simplify allocation of req Date: Thu, 26 Mar 2026 19:55:34 -0700 Message-ID: <20260327025534.7864-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" Get rid of automatic kfree and move allocation down to where it's used. Use kzalloc_flex as we're dealing with a flexible array member. Use struct_size to avoid some pointer math. Add __counted_by for extra runtime analysis. Move the counting variable assignment to right after allocation as required by __counted_by. Signed-off-by: Rosen Penev --- drivers/soc/qcom/wcnss_ctrl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c index 62b424e90d90..ffb31a049d4a 100644 --- a/drivers/soc/qcom/wcnss_ctrl.c +++ b/drivers/soc/qcom/wcnss_ctrl.c @@ -94,7 +94,7 @@ struct wcnss_download_nv_req { u16 seq; u16 last; u32 frag_size; - u8 fragment[]; + u8 fragment[] __counted_by(frag_size); } __packed; =20 /** @@ -201,16 +201,12 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss= , bool *expect_cbc) { const struct firmware *fw; struct device *dev =3D wcnss->dev; + struct wcnss_download_nv_req *req; const char *nvbin =3D NVBIN_FILE; const void *data; ssize_t left; int ret; =20 - struct wcnss_download_nv_req *req __free(kfree) =3D kzalloc(sizeof(*req) = + NV_FRAGMENT_SIZE, - GFP_KERNEL); - if (!req) - return -ENOMEM; - ret =3D of_property_read_string(dev->of_node, "firmware-name", &nvbin); if (ret < 0 && ret !=3D -EINVAL) return ret; @@ -224,11 +220,15 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss= , bool *expect_cbc) data =3D fw->data; left =3D fw->size; =20 + req =3D kzalloc_flex(*req, fragment, NV_FRAGMENT_SIZE); + if (!req) + return -ENOMEM; + + req->frag_size =3D NV_FRAGMENT_SIZE; req->hdr.type =3D WCNSS_DOWNLOAD_NV_REQ; - req->hdr.len =3D sizeof(*req) + NV_FRAGMENT_SIZE; + req->hdr.len =3D struct_size(req, fragment, NV_FRAGMENT_SIZE); =20 req->last =3D 0; - req->frag_size =3D NV_FRAGMENT_SIZE; =20 req->seq =3D 0; do { @@ -264,6 +264,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, = bool *expect_cbc) =20 release_fw: release_firmware(fw); + kfree(req); =20 return ret; } --=20 2.53.0