* [PATCH 1/3] net: fail alloc_netdev_mq if queue count < 1
@ 2010-10-18 18:02 Tom Herbert
2010-10-18 21:33 ` Ben Hutchings
0 siblings, 1 reply; 3+ messages in thread
From: Tom Herbert @ 2010-10-18 18:02 UTC (permalink / raw)
To: davem, netdev; +Cc: eric.dumazet, bhutchings
In alloc_netdev_mq fail if requested queue_count < 1.
Signed-off-by: Tom Herbert <therbert@google.com>
---
net/core/dev.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 04972a4..76db105 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5511,6 +5511,12 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
BUG_ON(strlen(name) >= sizeof(dev->name));
+ if (queue_count < 0) {
+ printk(KERN_ERR "alloc_netdev: Unable to allocate device "
+ "with zero queues.\n");
+ return NULL;
+ }
+
alloc_size = sizeof(struct net_device);
if (sizeof_priv) {
/* ensure 32-byte alignment of private area */
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/3] net: fail alloc_netdev_mq if queue count < 1
2010-10-18 18:02 [PATCH 1/3] net: fail alloc_netdev_mq if queue count < 1 Tom Herbert
@ 2010-10-18 21:33 ` Ben Hutchings
2010-10-18 21:46 ` Tom Herbert
0 siblings, 1 reply; 3+ messages in thread
From: Ben Hutchings @ 2010-10-18 21:33 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev, eric.dumazet
On Mon, 2010-10-18 at 11:02 -0700, Tom Herbert wrote:
> In alloc_netdev_mq fail if requested queue_count < 1.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> net/core/dev.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 04972a4..76db105 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -5511,6 +5511,12 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
>
> BUG_ON(strlen(name) >= sizeof(dev->name));
>
> + if (queue_count < 0) {
> + printk(KERN_ERR "alloc_netdev: Unable to allocate device "
> + "with zero queues.\n");
Off by one?
Ben.
> + return NULL;
> + }
> +
> alloc_size = sizeof(struct net_device);
> if (sizeof_priv) {
> /* ensure 32-byte alignment of private area */
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/3] net: fail alloc_netdev_mq if queue count < 1
2010-10-18 21:33 ` Ben Hutchings
@ 2010-10-18 21:46 ` Tom Herbert
0 siblings, 0 replies; 3+ messages in thread
From: Tom Herbert @ 2010-10-18 21:46 UTC (permalink / raw)
To: Ben Hutchings; +Cc: davem, netdev, eric.dumazet
> Off by one?
>
Yes, thanks for catching that.
> Ben.
>
>> + return NULL;
>> + }
>> +
>> alloc_size = sizeof(struct net_device);
>> if (sizeof_priv) {
>> /* ensure 32-byte alignment of private area */
>
> --
> Ben Hutchings, Senior Software Engineer, Solarflare Communications
> Not speaking for my employer; that's the marketing department's job.
> They asked us to note that Solarflare product names are trademarked.
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-18 21:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-18 18:02 [PATCH 1/3] net: fail alloc_netdev_mq if queue count < 1 Tom Herbert
2010-10-18 21:33 ` Ben Hutchings
2010-10-18 21:46 ` Tom Herbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox