From: Nick Child <nnac123@linux.ibm.com>
To: netdev@vger.kernel.org
Cc: Nick Child <nnac123@linux.ibm.com>
Subject: [PATCH net 2/2] netdev: Enforce index cap in netdev_get_tx_queue
Date: Fri, 17 Mar 2023 13:19:41 -0500 [thread overview]
Message-ID: <20230317181941.86151-2-nnac123@linux.ibm.com> (raw)
In-Reply-To: <20230317181941.86151-1-nnac123@linux.ibm.com>
When requesting a TX queue at a given index, prevent out-of-bounds
referencing by ensuring that the index is within the allocated number
of queues.
If there is an out-of-bounds reference then inform the user and return
a reference to the first tx queue instead.
Fixes: e8a0464cc950 ("netdev: Allocate multiple queues for TX.")
Signed-off-by: Nick Child <nnac123@linux.ibm.com>
---
include/linux/netdevice.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 23b0d7eaaadd..fe88b1a7393d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2482,6 +2482,13 @@ static inline
struct netdev_queue *netdev_get_tx_queue(const struct net_device *dev,
unsigned int index)
{
+ if (unlikely(index >= dev->num_tx_queues)) {
+ net_warn_ratelimited("%s selects TX queue %d, but number of TX queues is %d\n",
+ dev->name, index,
+ dev->num_tx_queues);
+ return &dev->_tx[0];
+ }
+
return &dev->_tx[index];
}
--
2.31.1
next prev parent reply other threads:[~2023-03-17 18:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-17 18:19 [PATCH net 1/2] net: Catch invalid index in XPS mapping Nick Child
2023-03-17 18:19 ` Nick Child [this message]
2023-03-17 18:45 ` [PATCH net 2/2] netdev: Enforce index cap in netdev_get_tx_queue Piotr Raczynski
2023-03-17 19:01 ` Nick Child
2023-03-21 4:49 ` Jakub Kicinski
2023-03-17 18:37 ` [PATCH net 1/2] net: Catch invalid index in XPS mapping Piotr Raczynski
2023-03-21 4:52 ` Jakub Kicinski
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=20230317181941.86151-2-nnac123@linux.ibm.com \
--to=nnac123@linux.ibm.com \
--cc=netdev@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.