From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (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 829503469E0 for ; Tue, 30 Jun 2026 01:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782782474; cv=none; b=PUsOmOziPf6YUCf5+zQHcd3Cqe6NBDWdTn/UpdwMHnV0EMfeVhHLwx2sF4e1Fg+A1TsgdjFtZLrx/SolwFPJ/wzCmbUC+Kwr7Iid57rZKzORBctcfPhGT5QO0+yjTjIusNv2zdj0dJXCSsbPqeQ0A4OMGeIkN1/w2ErPcSOmEew= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782782474; c=relaxed/simple; bh=NcHqpszERXjT6L6QRCE5wtLwJT4Wa3f3AWZ6iw/lRs8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GEo0Utvt6nD0NSHitR0t7s8zop+lHYhZEnR3cECd95x9hqLKlF3anAQu/Oacq7EtWntBDHYwb4JSrHcQgti/COi/4g4OHsi7PTm/ur0tTX10l7QJLH7FA84sgfPy3uMA2xOtIIXaY5oEnN2YoXKlpeHK8cJ6OfMwYlkLpEinNz0= 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=knBvwv6t; arc=none smtp.client-ip=209.85.215.175 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="knBvwv6t" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-c8ff15af279so2193452a12.3 for ; Mon, 29 Jun 2026 18:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782782463; x=1783387263; 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=WLMD0egzUCNwTlRP4H9rot2jquTKrKUwDtaYpTqbx2Q=; b=knBvwv6t6gpDSIkRVagkBaMb4sL127quTTaNfXA9w/KDSYq1Sy3vSDVn9ah8lD+d7G hwuk+DEaokclsExt3veXJEBNxfxxXhXzg7QqN8qr4S3esXWHRjwO8QKDtwl6/7ML6Lbu 9YGupVnnTU0dUnM7ZxSszPDCvNh3yDV60AYDZcQlOv1xHJzFcj33CoKvH7fMNMLYCbkF 9GV4co6il5n+8ZZ+8tFprnOUCxFRH6O5MTTXZdECLVewiTec2MtPdlETiWB05dtyOaZf bpW3YHAw3T871Qw9EyPaHovXwP9ZCZZ7gIofcUktvobpbRPPV40myf/HiVj5S7vAOHu4 QRlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782782463; x=1783387263; 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=WLMD0egzUCNwTlRP4H9rot2jquTKrKUwDtaYpTqbx2Q=; b=ITDK6gKfq9pe/m+r5xpmxw4OtQtglKNcvhxeqmQHB+J+JTkrd7I+CgygXhzxnDbkx9 1HdsK+SRsU39rWEnjAa/iPRmS6RVMD8z7757aybNMe0EuFOanbdQUDePmow3/X0JPz43 NQEcCKAEMb5axmeMVODhhKIh3Z9GwFWBngLdYU/+Frm5bdEHd/rNhMIZ2EhRB0BCdH0l 1iYn1SJ5nYD/a5qvafgC9wtqtR49b0sgBmiGQLB49R9Z4fHo69hc1OjgiR3dD6WsjXSM 8sWxmXY1ztEPV3ISGT7tTipWySm1IB1e88QRguesbVxIba/g3mVYg+dyBEJqfbXHBFuP Opjw== X-Forwarded-Encrypted: i=1; AHgh+Rr8wCCkCQgXesd+uqZxcWH/UpU+0dpWq/CBIjQ+0B4ca8bNIcUb4bhVZV/b+3ZndcYpW1MSgPb/DAvTAZU=@vger.kernel.org X-Gm-Message-State: AOJu0Yxgcvwe5OJyYZnSb1yNAKrf3njw2AnqQDxPqikgwozu3nin2cHH cj3ItuWNjQbcAjl83toLnqCEjOKPnbBWPYsnGZsflYy8fmQgaQWjN3bM X-Gm-Gg: AfdE7cmz0aWS9SVij/kVbjTtnViVn5G6bi+0BQZsRaoWZ6wjJ4OFByiF1+WiaghWRBM 3m+eSvqceRE8irFA335XH2BaRCTf+Gagb2x+uK571ty1BrSsFVO6Nj9Wh/TDcvsHSOdDj+AU96b ydxkaZA0DlPJ3SXx/R3BVlvm3tVjvOgjkMIEy8EK7hBSXF0aHqjLYL4cv/g3Ty6DWuEorNNfEBk 9ueyGVaPtIqKnQuygMS76OeTFu4xBWh14+jcT5YJaIRVlH9oZoM8t4ntw8zyr26YxINls6m7zsK aJDIRH5hnoa8ZKP2cluMH03Z3NjLj1iLYejRXpxPPeSUQO53zL2hT5wdTwvdNyHZs810u4rDJKv jHTGXQrSL/YYRlEssiP+Hl6UvGa+yfgvTQH+tpalGS9bE7Xb1tVNdr4y2gvmVRLTLC8IHdTJMmg i+1oEkMFbmXxAZB7qhHMQYW4Pdg6R4pRiAEozltJE82CABQ7G89xYS8+wPaTmO49mF5zoXTQc1P wJNMsDSXA== X-Received: by 2002:a05:6a00:ad89:b0:847:9aa8:d3bb with SMTP id d2e1a72fcca58-8479eed1d30mr1294340b3a.12.1782782463469; Mon, 29 Jun 2026 18:21:03 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8479ff8c7b5sm689184b3a.11.2026.06.29.18.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 18:21:02 -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: [PATCH] scsi: st: use kzalloc_array Date: Mon, 29 Jun 2026 18:21:01 -0700 Message-ID: <20260630012101.1461335-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Rosen Penev --- drivers/scsi/st.c | 12 +++--------- drivers/scsi/st.h | 3 ++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index f1c3c4946637..31ae189b18e7 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; } 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.54.0