From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 4542131E827 for ; Fri, 3 Jul 2026 21:53:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783115631; cv=none; b=hKPE+n3gTAjbuWaNT2waWj+1tAlBh/L13nwhUF/eOxBOVkm/aAQ6Pgp7TF9A0cKdC9XMNs38EqeNzxKDVzKCo92Vhi/vtRm3lvQpH0qJ4HNz7oWrYHX7NJkpFZuzIyZBDj0R0L55ocUK9lI8GamnZAcMk/CITTOK0TC+AAvJG40= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783115631; c=relaxed/simple; bh=72Sz3QddkifQrNxXKx0x9wIQF0n9ZEE7JMJkeBTc52k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SrZqoTVKqMlw0aPkK2n/Yxiu5sUaFonHV6JySnB4YpWCdKytU6/3I5OPyAPNijWsuCvgHKeqXfNESSZNWmSicTDqycgtmBVwSAkJSo43y4dWVDb2Xw8gsyLmaMgqaWhVzxHRSHPvAIkLQ5B6dwQcP73vWAbUlueNuUV7XYaN5t0= 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=BxMTWVk6; arc=none smtp.client-ip=209.85.214.178 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="BxMTWVk6" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2caa57a41cdso9340265ad.1 for ; Fri, 03 Jul 2026 14:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783115629; x=1783720429; 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=rRYClkwdsvHfRU5ObCiwGORJlzT5RqIkavkZCGUIPck=; b=BxMTWVk6s9GdIIGTlJOgdxIVZ+nzO1fuyyTxdYHJuA0eBrsSkbuV81J5EsZ+7aNnYz yQ1IIahf3wa+jOU+2otpLcX4qOyceLFU5tBOicLcMTbEVtUEaiomadZalHw11ltweez5 BGgfOIYWANeO01Zkb4RGcvhPlVXlaENFyhcdfa/7sscvs68sbsl5jP8C8ux9vmv23Z17 eb4vgwvxmhMZ9T5l2d//AMy6TWSvaZzW6EyZ45CtiUPObQKOexWMIYd6GFSXvkEUxN8K jIUySMpe4tB1kot1vT4KglCdkQJLkLcPoMnCR72igiA5lg4VN35lRi1Ts59MVBQ01TBB z7+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783115629; x=1783720429; 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=rRYClkwdsvHfRU5ObCiwGORJlzT5RqIkavkZCGUIPck=; b=fbizY7z5d7v+ymxcrbfhsMwMDWypuRj3g9Bgv3qhKVFF2Lg7weYkhyoUygKBltbEIc XoN/bIvfztIGz5STvKAZpC7JdcP6s2NsbqStyLpwE3mrjWTMEV/M/+nWjzqZ3rkiVXBG W3Y4obSw0rJhLIjAPiRDPQZW/jtQp6dbm4brOcW9+CNBcApuS+41W8sKnDfzjgxucbeE 2/WOAj3L4M6sJHjR7wE9u6Ex5NlSYtforHL6/XoQCYCBxp1friCbqncnGu6UfEMv4eyl 9cRPe3wiCBdRHdn7dhYx9laqOyuIhD/XluaXzmQ666PBUyYVA69rR9Sn1syLQBBNNX+9 LS+w== X-Forwarded-Encrypted: i=1; AHgh+RruWLGIgdRjRkpZtwr0o6V2uN4KUNsYiRIq50EZ6m6ugmIXdx2lH5W+2S/awOAC90sjZlbBSWoJl5Y3MiLAoVI=@vger.kernel.org X-Gm-Message-State: AOJu0YwYneCb3/mtlUQdclXoExpLyCWAqr1gqOTm34mckVcRzNuUQTvN TM8ZbdvfVn43jXHWystGBtvolNePy9a91V4vKIN9JLKiCOgsZRzmkFBh X-Gm-Gg: AfdE7cmuHLDIOmtn8kzWVdKPDPlyqL9C+VM0P4n5GiZ2l/NRGiY7oSQ7sCRJp/hUx/y ZeJTIACnn0K+Yb8Rw9n15gIX5wLd+FA+GNyooD70QY4DVpAjGmehNatfow5LkrAGMopejHeVhXB X+ZkWddjG/VjIEW7tcrnqfXzh3TcjdSuYVu8EL2hkvOavFy0o27kcCF5Ok6GEvMARXd1EPFermC g4t+bQcV7hS2T5CEwNy0C2JGCZoklzO5W+dVNmfoDJPxiuXOfkqHWsiZMRfRx5vWY13ECmZ6HpZ hlJ+Dj1tHyD126TpQWh5n8ryclndBPOI+W37EZTGkBwLTkFGEq8ap0cedQZBPpkTmcdOCKZsTD5 MkZvb9ITpIkcS3xPhQCJwk1gE29ooIKrW2+mko7ae7kPyAmBbL9vy5Tkv8NDvpoS71j9q7JyMnb gSckTMV6JPErllZta88l6yIghhPed6cLU+Bd+h3T1yBnnOsCnQAuyGcbbeD449Eo+nN5oi/O9p/ /NNyehuhw== X-Received: by 2002:a17:903:2f81:b0:2c9:b8e5:5741 with SMTP id d9443c01a7336-2cbb9ee1c39mr7826865ad.35.1783115629443; Fri, 03 Jul 2026 14:53:49 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cad776577esm14738535ad.39.2026.07.03.14.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2026 14:53:47 -0700 (PDT) From: Rosen Penev To: linux-scsi@vger.kernel.org Cc: =?UTF-8?q?Kai=20M=C3=A4kisara?= , "James E.J. Bottomley" , "Martin K. Petersen" , 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|_ptr)?\b) Subject: [PATCHv2] scsi: st: use kzalloc_array() Date: Fri, 3 Jul 2026 14:53:45 -0700 Message-ID: <20260703215345.253901-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Merge allocations to simpily memory management with kzalloc_array(). No need to kfree separately. Add __counted_by for extra runtime analysis. Move counting variable assignment after allocation as kzalloc_flex() does this with newer compilers. Signed-off-by: Rosen Penev --- v2: remove the kfree and add a description. drivers/scsi/st.c | 13 +++---------- drivers/scsi/st.h | 3 ++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index f1c3c4946637..55238f23f743 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -149,7 +149,7 @@ static struct st_dev_parm { mode counts */ static const char *st_formats[] = { "", "r", "k", "s", "l", "t", "o", "u", - "m", "v", "p", "x", "a", "y", "q", "z"}; + "m", "v", "p", "x", "a", "y", "q", "z"}; /* The default definitions have been moved to st_options.h */ @@ -3973,21 +3973,15 @@ static struct st_buffer *new_tape_buffer(int max_sg) { struct st_buffer *tb; - tb = kzalloc_obj(struct st_buffer); + tb = kzalloc_flex(*tb, reserved_pages, max_sg); if (!tb) { printk(KERN_NOTICE "st: Can't allocate new tape buffer.\n"); return NULL; } - tb->frp_segs = 0; tb->use_sg = max_sg; + tb->frp_segs = 0; tb->buffer_size = 0; - tb->reserved_pages = kzalloc_objs(struct page *, max_sg); - if (!tb->reserved_pages) { - kfree(tb); - return NULL; - } - return tb; } @@ -4533,7 +4527,6 @@ static void scsi_tape_release(struct kref *kref) if (tpnt->buffer) { normalize_buffer(tpnt->buffer); - kfree(tpnt->buffer->reserved_pages); kfree(tpnt->buffer); } diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h index 0d7c4b8c2c8a..759f4c43d563 100644 --- a/drivers/scsi/st.h +++ b/drivers/scsi/st.h @@ -45,7 +45,6 @@ struct st_buffer { int syscall_result; struct st_request *last_SRpnt; struct st_cmdstatus cmdstat; - struct page **reserved_pages; int reserved_page_order; struct page **mapped_pages; struct rq_map_data map_data; @@ -53,6 +52,8 @@ struct st_buffer { unsigned short use_sg; /* zero or max number of s/g segments for this adapter */ unsigned short sg_segs; /* number of segments in s/g list */ unsigned short frp_segs; /* number of buffer segments */ + + struct page *reserved_pages[] __counted_by(use_sg); }; /* The tape mode definition */ -- 2.55.0