From: Rosen Penev <rosenp@gmail.com>
To: linux-usb@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kees Cook <kees@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
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] usb: fhci: use kzalloc_flex for priv struct
Date: Thu, 12 Mar 2026 17:34:55 -0700 [thread overview]
Message-ID: <20260313003456.124270-1-rosenp@gmail.com> (raw)
Convert kzalloc_obj(s) to kzalloc_flex to save an allocation.
Add __counted_by to get extra runtime analysis. Move counting variable
assignment immediately after allocation as required by __counted_by.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/usb/host/fhci-hcd.c | 15 +++------------
drivers/usb/host/fhci.h | 3 ++-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 271bcbe9b326..71e785f445a3 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -426,16 +426,11 @@ static int fhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
}
/* allocate the private part of the URB */
- urb_priv = kzalloc_obj(*urb_priv, mem_flags);
+ urb_priv = kzalloc_flex(*urb_priv, tds, size, mem_flags);
if (!urb_priv)
return -ENOMEM;
- /* allocate the private part of the URB */
- urb_priv->tds = kzalloc_objs(*urb_priv->tds, size, mem_flags);
- if (!urb_priv->tds) {
- kfree(urb_priv);
- return -ENOMEM;
- }
+ urb_priv->num_of_tds = size;
spin_lock_irqsave(&fhci->lock, flags);
@@ -444,8 +439,6 @@ static int fhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
goto err;
/* fill the private part of the URB */
- urb_priv->num_of_tds = size;
-
urb->status = -EINPROGRESS;
urb->actual_length = 0;
urb->error_count = 0;
@@ -453,10 +446,8 @@ static int fhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
fhci_queue_urb(fhci, urb);
err:
- if (ret) {
- kfree(urb_priv->tds);
+ if (ret)
kfree(urb_priv);
- }
spin_unlock_irqrestore(&fhci->lock, flags);
return ret;
}
diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index 1f57b0989485..e221b28e8608 100644
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -387,9 +387,10 @@ struct urb_priv {
int tds_cnt;
int state;
- struct td **tds;
struct ed *ed;
struct timer_list time_out;
+
+ struct td *tds[] __counted_by(num_of_tds);
};
struct endpoint {
--
2.53.0
reply other threads:[~2026-03-13 0:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260313003456.124270-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavoars@kernel.org \
--cc=kees@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox