From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Or Gerlitz <ogerlitz@mellanox.com>,
Jesper Dangaard Brouer <brouer@redhat.com>,
Huy Nguyen <huyn@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: [PATCH net 6/6] net/mlx5: Fix invalid pointer reference when prof_sel parameter is invalid
Date: Fri, 4 Nov 2016 01:48:47 +0200 [thread overview]
Message-ID: <1478216927-31328-7-git-send-email-saeedm@mellanox.com> (raw)
In-Reply-To: <1478216927-31328-1-git-send-email-saeedm@mellanox.com>
From: Huy Nguyen <huyn@mellanox.com>
When prof_sel is invalid, mlx5_core_warn is called but the
mlx5_core_dev is not initialized yet. Solution is moving the prof_sel code
after dev->pdev assignment
Fixes: 2974ab6e8bd8 ('net/mlx5: Improve driver log messages')
Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index d5433c4..3eb9315 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1226,6 +1226,9 @@ static int init_one(struct pci_dev *pdev,
pci_set_drvdata(pdev, dev);
+ dev->pdev = pdev;
+ dev->event = mlx5_core_event;
+
if (prof_sel < 0 || prof_sel >= ARRAY_SIZE(profile)) {
mlx5_core_warn(dev,
"selected profile out of range, selecting default (%d)\n",
@@ -1233,8 +1236,6 @@ static int init_one(struct pci_dev *pdev,
prof_sel = MLX5_DEFAULT_PROF;
}
dev->profile = &profile[prof_sel];
- dev->pdev = pdev;
- dev->event = mlx5_core_event;
INIT_LIST_HEAD(&priv->ctx_list);
spin_lock_init(&priv->ctx_lock);
--
2.7.4
next prev parent reply other threads:[~2016-11-03 23:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-03 23:48 [PATCH net 0/6] Mellanox 100G mlx5 fixes 2016-11-04 Saeed Mahameed
2016-11-03 23:48 ` [PATCH net 1/6] net/mlx5e: Fix XDP error path of mlx5e_open_channel() Saeed Mahameed
2016-11-03 23:48 ` [PATCH net 2/6] net/mlx5e: Re-arrange XDP SQ/CQ creation Saeed Mahameed
2016-11-03 23:48 ` [PATCH net 3/6] net/mlx5e: Disallow changing name-space for VF representors Saeed Mahameed
2016-11-03 23:48 ` [PATCH net 4/6] net/mlx5e: Handle matching on vlan priority for offloaded TC rules Saeed Mahameed
2016-11-03 23:48 ` [PATCH net 5/6] net/mlx5: E-Switch, Set the actions for offloaded rules properly Saeed Mahameed
2016-11-03 23:48 ` Saeed Mahameed [this message]
2016-11-04 19:00 ` [PATCH net 0/6] Mellanox 100G mlx5 fixes 2016-11-04 David Miller
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=1478216927-31328-7-git-send-email-saeedm@mellanox.com \
--to=saeedm@mellanox.com \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=huyn@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
/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