From nobody Tue Apr 7 19:54:44 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 8385336C9F5 for ; Wed, 11 Mar 2026 23:25:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271519; cv=none; b=RPVxmQ4HuwXb9V6Tu78AcSUaT6pF5LtOXuuGPp49xtcBhfOwTvlBPoQgB7Qr4kgtKnA6zC58OBx7AcPDMjbp80mtNuBKuJUlJn7aXp5lN7a1c2MIW/xGxZeJPSvHZ8Az9grfb2WTpukJz0wU6q9FDP4v5+3BQ8DtxFTiJEqWSOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271519; c=relaxed/simple; bh=4fdZArySZ+XJjROcq5s1A1cNbYsiBB6urEHx6VMBwqk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lPaqUg73XbSsr1t+9eRSNeB3StJd/SnD3eI0+Ws2IWtp/YBZNzD2S+M7tHQoKlZThmKyyLNm1PB97oYQ9/zLdf2eYy4Fvpq7//XWfhDpYEVolgYfl5i/iyB7zVIn9efUnY2Yz8tdQtRrCL8DkGOSC91gDpBxgTlS/39rAEKpi2c= 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=KvT10Yrw; arc=none smtp.client-ip=209.85.214.171 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="KvT10Yrw" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2aaed195901so2435755ad.0 for ; Wed, 11 Mar 2026 16:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773271518; x=1773876318; 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=arrtkfrkfm9vk7ifZKS0o1irVWoYoX4yhM9Zhp08W/o=; b=KvT10Yrw/oN4XGNmA1PuisFXM/Hg1bYrsUSNKfgZIy+t0RinBfzdZWCwxkLA3ua7sF cZH7ziLmLR0d12LwfXfLdXrQmqnX0OUeZEeO1r2bNWvplXmnIDfJ4le8Q9HFodPtA7SJ gqKp+VdE9NjkfVcP4R2fopqA7P+5FPyPKSjOqoWPDKvqrhPdGSJtKTc40E6955macLsF rcaKf/pHhNCU2x681tJusFoxyWK+a1mVBwJoAcaw/kpZvIAnshBQR8jRLRyUr3GpFEx2 zGYXGWdwnNIFfjKHQy+FeCmMjl6PvJy+2fXGSgHq7eOTGYj7GrhijOJYzwKZ4Yey9myY KwXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773271518; x=1773876318; 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=arrtkfrkfm9vk7ifZKS0o1irVWoYoX4yhM9Zhp08W/o=; b=JVhpJmQKFnV69+GneDFBcXstsrKXedbSJZiRd5NT2gl1zuER38ZXRhkveKntchmH9T 1gXUQ2Erbc94265Fd3E0fmoyoG0k+Y3VOjDcnVxZXmImm6OOR5MLCrxMpWXHCVlhoQgn iF5cL2xw/4T62K8RFa8lE5rReAzRWYAJo+fjYO3GqaoaqoXqcEhAUEB9PV1xxpVEeZ89 2MHfyMgi6RSTTYC5cJQpdboJEobARMW5/tYTngyefQhDpfMZeoupNBE3rTc/nwrAPz4X 6SycymqvmArFKDUspfcVElE3WH7xbYphFl4KEzLCKnbu5lxtw6onQdsvvChAzzNzvih2 lRig== X-Gm-Message-State: AOJu0Yw6608N/9QopSxoihmwenzmCaOYqEqCf1iyPDpq7e8j+UYBXe1S T5UJhkpe+/uu8tDjbGVQQND5qwIAOjslYwIxAxcuA7Tv38FEIGZrBdzhdGL9QIw1 X-Gm-Gg: ATEYQzybYD3E0uszphBnbfb4dKsR+HV29iFtaJJWoUQc6I2TZ/VlFdrQG/77mdxPrCl f6YWg0U2ZrtPD1UvIytgusn5TOiACwmkDzjB3BBBtTbwtO+QaHFru6HFny4gU5i1woOmRvEsssR upiocmO83VTMq6QxUR+c3oTGd8tdaMvtQsHwla1wrgveDHOMLJUrj0C3dlSIm54yf6Jy+Y1ktTt GLmm6BlNFaCy3HecYnT220yNP2LQ/frMoD47N7po2j8ehoEl2aTgkASdSMTLo4uD3gMOBgXZJly xTFUHGhMu6HO0YLSEjofXQKeski34UU3MlggIgzB5HJhVdFraS5pOUoVjaD4GHNuG1cqEFX6VXp 5gPELo0Rb5RhYxfuPC2ALVF3xhnA+HsAa6O86OYrbHPhgr1wAibxzSPmbwxPDpvxJToCV1ZHe8r 3Iv5ifywHXtDgXe3+PvyRRYFY50u0zTIv0oNzI1C/7KQNhwrG9mEGq5g== X-Received: by 2002:a17:903:2350:b0:2ae:ac0c:5a1c with SMTP id d9443c01a7336-2aeae7cb26emr42527175ad.15.1773271517601; Wed, 11 Mar 2026 16:25:17 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae246fe5sm38453045ad.28.2026.03.11.16.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 16:25:16 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Ian Abbott , H Hartley Sweeten , Kees Cook , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH] comedi: isadma: use kzalloc_flex Date: Wed, 11 Mar 2026 16:24:59 -0700 Message-ID: <20260311232459.18407-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" Switched struct pointer member to a flexible array member to get rid of kzalloc_objs as there's no need for them to be separately allocated. AAdded __counted_by for extra runtime analysis. Signed-off-by: Rosen Penev --- drivers/comedi/drivers/comedi_isadma.c | 21 +++++++-------------- include/linux/comedi/comedi_isadma.h | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/comedi/drivers/comedi_isadma.c b/drivers/comedi/driver= s/comedi_isadma.c index 04ce3eb9ae4f..c35811bde735 100644 --- a/drivers/comedi/drivers/comedi_isadma.c +++ b/drivers/comedi/drivers/comedi_isadma.c @@ -161,14 +161,10 @@ struct comedi_isadma *comedi_isadma_alloc(struct come= di_device *dev, if (n_desc < 1 || n_desc > 2) goto no_dma; =20 - dma =3D kzalloc_obj(*dma); + dma =3D kzalloc_flex(*dma, desc, n_desc); if (!dma) goto no_dma; =20 - desc =3D kzalloc_objs(*desc, n_desc); - if (!desc) - goto no_dma; - dma->desc =3D desc; dma->n_desc =3D n_desc; if (dev->hw_dev) { dma->dev =3D dev->hw_dev; @@ -231,15 +227,12 @@ void comedi_isadma_free(struct comedi_isadma *dma) if (!dma) return; =20 - if (dma->desc) { - for (i =3D 0; i < dma->n_desc; i++) { - desc =3D &dma->desc[i]; - if (desc->virt_addr) - dma_free_coherent(dma->dev, desc->maxsize, - desc->virt_addr, - desc->hw_addr); - } - kfree(dma->desc); + for (i =3D 0; i < dma->n_desc; i++) { + desc =3D &dma->desc[i]; + if (desc->virt_addr) + dma_free_coherent(dma->dev, desc->maxsize, + desc->virt_addr, + desc->hw_addr); } if (dma->chan2 && dma->chan2 !=3D dma->chan) free_dma(dma->chan2); diff --git a/include/linux/comedi/comedi_isadma.h b/include/linux/comedi/co= medi_isadma.h index 9d2b12db7e6e..7514ce222fa6 100644 --- a/include/linux/comedi/comedi_isadma.h +++ b/include/linux/comedi/comedi_isadma.h @@ -48,11 +48,11 @@ struct comedi_isadma_desc { */ struct comedi_isadma { struct device *dev; - struct comedi_isadma_desc *desc; int n_desc; int cur_dma; unsigned int chan; unsigned int chan2; + struct comedi_isadma_desc desc[] __counted_by(n_desc); }; =20 #if IS_ENABLED(CONFIG_ISA_DMA_API) --=20 2.53.0