* [PATCH v2 1/1] xen-netfront: update num_queues to real created
@ 2015-10-19 5:37 Joe Jin
2015-10-19 13:47 ` Boris Ostrovsky
2015-10-21 14:45 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Joe Jin @ 2015-10-19 5:37 UTC (permalink / raw)
To: Boris Ostrovsky, Konrad Rzeszutek Wilk, ian.campbell, wei.liu2,
annie.li, davem
Cc: netdev, xen-devel, stable
Sometimes xennet_create_queues() may failed to created all requested
queues, we need to update num_queues to real created to avoid NULL
pointer dereference.
Signed-off-by: Joe Jin <joe.jin@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: David S. Miller <davem@davemloft.net>
---
drivers/net/xen-netfront.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index f821a97..6febc05 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1706,19 +1706,19 @@ static void xennet_destroy_queues(struct netfront_info *info)
}
static int xennet_create_queues(struct netfront_info *info,
- unsigned int num_queues)
+ unsigned int *num_queues)
{
unsigned int i;
int ret;
- info->queues = kcalloc(num_queues, sizeof(struct netfront_queue),
+ info->queues = kcalloc(*num_queues, sizeof(struct netfront_queue),
GFP_KERNEL);
if (!info->queues)
return -ENOMEM;
rtnl_lock();
- for (i = 0; i < num_queues; i++) {
+ for (i = 0; i < *num_queues; i++) {
struct netfront_queue *queue = &info->queues[i];
queue->id = i;
@@ -1728,7 +1728,7 @@ static int xennet_create_queues(struct netfront_info *info,
if (ret < 0) {
dev_warn(&info->netdev->dev,
"only created %d queues\n", i);
- num_queues = i;
+ *num_queues = i;
break;
}
@@ -1738,11 +1738,11 @@ static int xennet_create_queues(struct netfront_info *info,
napi_enable(&queue->napi);
}
- netif_set_real_num_tx_queues(info->netdev, num_queues);
+ netif_set_real_num_tx_queues(info->netdev, *num_queues);
rtnl_unlock();
- if (num_queues == 0) {
+ if (*num_queues == 0) {
dev_err(&info->netdev->dev, "no queues\n");
return -EINVAL;
}
@@ -1788,7 +1788,7 @@ static int talk_to_netback(struct xenbus_device *dev,
if (info->queues)
xennet_destroy_queues(info);
- err = xennet_create_queues(info, num_queues);
+ err = xennet_create_queues(info, &num_queues);
if (err < 0)
goto destroy_ring;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] xen-netfront: update num_queues to real created
2015-10-19 5:37 [PATCH v2 1/1] xen-netfront: update num_queues to real created Joe Jin
@ 2015-10-19 13:47 ` Boris Ostrovsky
2015-10-21 14:45 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Boris Ostrovsky @ 2015-10-19 13:47 UTC (permalink / raw)
To: Joe Jin, Konrad Rzeszutek Wilk, ian.campbell, wei.liu2, annie.li, davem
Cc: netdev, xen-devel, stable
On 10/19/2015 01:37 AM, Joe Jin wrote:
> Sometimes xennet_create_queues() may failed to created all requested
> queues, we need to update num_queues to real created to avoid NULL
> pointer dereference.
>
> Signed-off-by: Joe Jin <joe.jin@oracle.com>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: David S. Miller <davem@davemloft.net>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] xen-netfront: update num_queues to real created
2015-10-19 5:37 [PATCH v2 1/1] xen-netfront: update num_queues to real created Joe Jin
2015-10-19 13:47 ` Boris Ostrovsky
@ 2015-10-21 14:45 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-10-21 14:45 UTC (permalink / raw)
To: joe.jin
Cc: boris.ostrovsky, konrad.wilk, ian.campbell, wei.liu2, annie.li,
netdev, xen-devel, stable
From: Joe Jin <joe.jin@oracle.com>
Date: Mon, 19 Oct 2015 13:37:17 +0800
> Sometimes xennet_create_queues() may failed to created all requested
> queues, we need to update num_queues to real created to avoid NULL
> pointer dereference.
>
> Signed-off-by: Joe Jin <joe.jin@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-21 14:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-19 5:37 [PATCH v2 1/1] xen-netfront: update num_queues to real created Joe Jin
2015-10-19 13:47 ` Boris Ostrovsky
2015-10-21 14:45 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).