Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 780ab790 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

qlcnic: protect resource access 



We do netif_device_attach, even if resource allocation fails.
Driver callbacks can be called, if device is attached.
All these callbacks need to be protected by ADAPTER_UP_MAGIC check.

Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ed6f1353

drivers/net/qlcnic/qlcnic_main.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,9 @@ qlcnic_napi_enable(struct qlcnic_adapter *adapter) 
	struct qlcnic_host_sds_ring *sds_ring;

	struct qlcnic_host_sds_ring *sds_ring;

	struct qlcnic_recv_context *recv_ctx = &adapter->recv_ctx;

	struct qlcnic_recv_context *recv_ctx = &adapter->recv_ctx;





	if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)

		return;



	for (ring = 0; ring < adapter->max_sds_rings; ring++) {

	for (ring = 0; ring < adapter->max_sds_rings; ring++) {

		sds_ring = &recv_ctx->sds_rings[ring];

		sds_ring = &recv_ctx->sds_rings[ring];

		napi_enable(&sds_ring->napi);

		napi_enable(&sds_ring->napi);
@@ -222,6 +225,9 @@ qlcnic_napi_disable(struct qlcnic_adapter *adapter) 
	struct qlcnic_host_sds_ring *sds_ring;

	struct qlcnic_host_sds_ring *sds_ring;

	struct qlcnic_recv_context *recv_ctx = &adapter->recv_ctx;

	struct qlcnic_recv_context *recv_ctx = &adapter->recv_ctx;





	if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)

		return;



	for (ring = 0; ring < adapter->max_sds_rings; ring++) {

	for (ring = 0; ring < adapter->max_sds_rings; ring++) {

		sds_ring = &recv_ctx->sds_rings[ring];

		sds_ring = &recv_ctx->sds_rings[ring];

		qlcnic_disable_int(sds_ring);

		qlcnic_disable_int(sds_ring);
@@ -1573,6 +1579,11 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	int frag_count, no_of_desc;

	int frag_count, no_of_desc;

	u32 num_txd = tx_ring->num_desc;

	u32 num_txd = tx_ring->num_desc;





	if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {

		netif_stop_queue(netdev);

		return NETDEV_TX_BUSY;

	}



	frag_count = skb_shinfo(skb)->nr_frags + 1;

	frag_count = skb_shinfo(skb)->nr_frags + 1;





	/* 4 fragments per cmd des */

	/* 4 fragments per cmd des */