From nobody Thu Apr 2 22:28:52 2026 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.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 4AFEE296BDC for ; Thu, 26 Mar 2026 05:35:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774503358; cv=none; b=TebR7fQw/p5Hh/HmTut6f7LPOR2cxPQCfRgMOEeq/6QT9J62AFUu8iTHjc/4BiTBbzQMrjuDIe2rBSyjDVDAIx+lcBwncQLrfP1KRYLs5OU1LyDMi7U+DM92bS+hpns3g05NjWagikYDp9YNv+XrDv11LqaDikUTih2wiUMCQUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774503358; c=relaxed/simple; bh=Qr8ZdoV03XC8Y/zIkKOZ6eJPlAgDEERg45y8qVbjw7c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pOMJDUBPsJyhkHc8YFqbKHLCHQg2sw+Ye6sD2zlzgV2Fq3g0AwRUVMYUJEtKPZ4Y5FOTeA54Xvzfuk8vPMH8OgEKcBduomkCnnGqrVxvZuMUhAm7IfwsHcNiuQm21kJ0LltGh/c3wdZAavneXn4xmpSq+PsK2Cw4jpTuapI0ViM= 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=sRbrYDQX; arc=none smtp.client-ip=209.85.215.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="sRbrYDQX" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c7412b07f22so771138a12.0 for ; Wed, 25 Mar 2026 22:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774503357; x=1775108157; 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=+jGE1cCQwPm570qppMAHgNNyYwfNt8xMLKnlmo6j/5s=; b=sRbrYDQX6tXzYaRV/NjaQv/8TMEUDIG1QFHZw/LzYw9meNiX4+s5ni+I+RgHYyiigy WbNrpydM8hsgHkgCp6Zeiv6+bsuiiFN9sWKWlRnXCKNTtNLNPsydabe+Ql/3rypwK16y AWhcKXR/bPj1tRm5fxmLAHNaygAd/wuljWa2lh/NS9jvrnbyv+u9MpvV4+2tm9IPX0DH 6wMKXIvPgTx2io13JoMsidL6DOvyZH1yqxz7AWv5EVYwpT5Vgce4H1SD3ThbBIUx8eTA wFYgXRyrtM3h2ao0DmAy9RUjGjOd1c8FfsXCDgBhGVPJDdBdS4zWtjQcUQjOy5P1Gw99 jYow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774503357; x=1775108157; 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=+jGE1cCQwPm570qppMAHgNNyYwfNt8xMLKnlmo6j/5s=; b=aU6gz2EWe1h/0MkOplq3lX0aMof1ZCWXRJvdzviHc8QOvXhryMY+puoxtS2DhsD9X2 GyQ5aZ+l1emq6vQnVw1ovK5Fp3CxwWALD07K+lJX+b8vu0AXyK42KCzqOURASKe/4s/l vjmxw5wGWYqfMMLZogs5ackA+8Nd99M4GfGjf27PTNHiS0cA3yzqfs7tRai0XCatOgAG 9jTXx9GREgCy1JDt7ISF0WN3lMOuBLLft6txtP/8w7ZEUkHv2ljZubO0SEsc0VpPT94o IDUzi7zfER8pzW9wFOWZfw/7mPWDn2xtnNzAKKjTGTilF3MEcIGTUnVXe80D1pMxtc5I ex0w== X-Forwarded-Encrypted: i=1; AJvYcCVrLVlNddVwIPhL4Jb4iaZh9FdVVxDPpxfQDMppgCgRDk5Don8FV5g7vFoEqhp+C3m/rDwhQmmD5WTa1TM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/pZbNSlfm5tWqL76il8wRMBvbQ3wq3nvLiElph/VBhR1gc2dr XQs8QC6xIlLi1z8/rlgMSo+DjC1q22QeZLsQ9i3x6oK3+oY+GUmNEnnQ X-Gm-Gg: ATEYQzyCFjSAlfT92pYbflfTKgzDRHW3SxcfgKCOVcupIG5dq7vOBEJciCkalFPug8q 8EgQL8E5fDuVPOT07NyXWtMKhECy8LzYz9/e81leAmjSsLbEL3NwS+PNMkONv6pBMw6O6MxkAh9 6B/xk5flUmCfFdvOQk3727X6LdgwScfUGnfnOm0hzIK5X4RrF/zlaUWVnzIWmvlsxpGFYPO4CK6 HweQMha0ZO4kvSto/lguYqgrflrZWp5rVUuLmkuwLXxqelc4bqRnFvNvtd67k68A/YywmR1pJPs 9sSfhA1mn6U84ynR3HxpAS2FjTUg+E5YfTNDTEWleix7yswd9u/UwHi/btbpKBvPSobWEVLODoc Mag3YZtJzSjvpCdLdRdfY4iWstL16HercIaA+hCNppKJGK4m9DY89XCn2+Dx7yH69ElYW5ctpRT uAFf3scnoUnsgXqoRyop3/YhKjBiTsSQPwtHdER+u9UlmQOxtaJ2Dmfhs= X-Received: by 2002:a05:6a21:3383:b0:39b:e3aa:df2d with SMTP id adf61e73a8af0-39c734cc786mr376742637.7.1774503356576; Wed, 25 Mar 2026 22:35:56 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c767382bcecsm1080464a12.13.2026.03.25.22.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 22:35:55 -0700 (PDT) From: Rosen Penev To: linux-atm-general@lists.sourceforge.net Cc: Chas Williams <3chas3@gmail.com>, Kees Cook , "Gustavo A. R. Silva" , netdev@vger.kernel.org (open list:ATM), 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] atm: nicstar: simplify allocation Date: Wed, 25 Mar 2026 22:35:39 -0700 Message-ID: <20260326053539.336831-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" Use a flexible array member with kzalloc_flex to combine allocations into one. Add __counted_by for extra runtime analysis. Move counting variable assignment to right after allocation as required by __counted_by. Signed-off-by: Rosen Penev --- v2: use kzalloc_flex drivers/atm/nicstar.c | 17 +++++------------ drivers/atm/nicstar.h | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 24e51343df15..b01c6cfdcc87 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -867,23 +867,17 @@ static scq_info *get_scq(ns_dev *card, int size, u32 = scd) if (size !=3D VBR_SCQSIZE && size !=3D CBR_SCQSIZE) return NULL; - scq =3D kmalloc_obj(*scq); + scq =3D kzalloc_flex(*scq, skb, size / NS_SCQE_SIZE); if (!scq) return NULL; - scq->org =3D dma_alloc_coherent(&card->pcidev->dev, - 2 * size, &scq->dma, GFP_KERNEL); + + scq->num_entries =3D size / NS_SCQE_SIZE; + + scq->org =3D dma_alloc_coherent(&card->pcidev->dev, 2 * size, &scq->dma, = GFP_KERNEL); if (!scq->org) { kfree(scq); return NULL; } - scq->skb =3D kzalloc_objs(*scq->skb, size / NS_SCQE_SIZE); - if (!scq->skb) { - dma_free_coherent(&card->pcidev->dev, - 2 * size, scq->org, scq->dma); - kfree(scq); - return NULL; - } - scq->num_entries =3D size / NS_SCQE_SIZE; scq->base =3D PTR_ALIGN(scq->org, size); scq->next =3D scq->base; scq->last =3D scq->base + (scq->num_entries - 1); @@ -928,7 +922,6 @@ static void free_scq(ns_dev *card, scq_info *scq, struc= t atm_vcc *vcc) } } } - kfree(scq->skb); dma_free_coherent(&card->pcidev->dev, 2 * (scq->num_entries =3D=3D VBR_SCQ_NUM_ENTRIES ? VBR_SCQSIZE : CBR_SCQSIZE), diff --git a/drivers/atm/nicstar.h b/drivers/atm/nicstar.h index 1b7f1dfc1735..ba45be53d40e 100644 --- a/drivers/atm/nicstar.h +++ b/drivers/atm/nicstar.h @@ -667,14 +667,14 @@ typedef struct scq_info { ns_scqe *next; volatile ns_scqe *tail; /* Not related to the nicstar register */ unsigned num_entries; - struct sk_buff **skb; /* Pointer to an array of pointers - to the sk_buffs used for tx */ u32 scd; /* SRAM address of the corresponding SCD */ int tbd_count; /* Only meaningful on variable rate */ wait_queue_head_t scqfull_waitq; volatile char full; /* SCQ full indicator */ spinlock_t lock; /* SCQ spinlock */ + struct sk_buff *skb[] __counted_by(num_entries); /* Pointer to an array o= f pointers + to the sk_buffs used for tx */ } scq_info; typedef struct rsq_info { -- 2.53.0