2017-07-12 07:53:16

by Dan Carpenter

Subject: [PATCH] iwlwifi: pcie: Fix error code in iwl_trans_pcie_alloc()

We accidentally forgot to propogate the error code on this path. It
means we return ERR_PTR(0) which is NULL and it results in a NULL
dereference in the caller.

Fixes: 2e5d4a8f61dc ("iwlwifi: pcie: Add new configuration to enable MSIX")
Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 92b3a55d0fbc..f95eec52508e 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3150,7 +3150,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
init_waitqueue_head(&trans_pcie->d0i3_waitq);

if (trans_pcie->msix_enabled) {
- if (iwl_pcie_init_msix_handler(pdev, trans_pcie))
+ ret = iwl_pcie_init_msix_handler(pdev, trans_pcie);
+ if (ret)
goto out_no_pci;
} else {
ret = iwl_pcie_alloc_ict(trans);

2017-07-19 08:22:10

by Dan Carpenter

Subject: Re: [PATCH] iwlwifi: pcie: Fix error code in iwl_trans_pcie_alloc()

Oops, heh, sorry. I switched computers so I first one wasn't in my
outbox.

regards,
dan carpenter

2017-07-19 08:23:17

by Luciano Coelho

Subject: Re: [PATCH] iwlwifi: pcie: Fix error code in iwl_trans_pcie_alloc()

T24gV2VkLCAyMDE3LTA3LTE5IGF0IDExOjIxICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K
PiBPb3BzLCBoZWgsIHNvcnJ5LiAgSSBzd2l0Y2hlZCBjb21wdXRlcnMgc28gSSBmaXJzdCBvbmUg
d2Fzbid0IGluIG15DQo+IG91dGJveC4NCg0KTm8gd29ycmllcywgYmV0dGVyIHNhZmUgdGhhbiBz
b3JyeS4gOikNCg0KLS0NCkx1Y2Eu

2017-07-19 06:23:55

by Luciano Coelho

Subject: Re: [PATCH] iwlwifi: pcie: Fix error code in iwl_trans_pcie_alloc()

SGkgRGFuLA0KDQpPbiBXZWQsIDIwMTctMDctMTIgYXQgMTA6NTMgKzAzMDAsIERhbiBDYXJwZW50
ZXIgd3JvdGU6DQo+IFdlIGFjY2lkZW50YWxseSBmb3Jnb3QgdG8gcHJvcG9nYXRlIHRoZSBlcnJv
ciBjb2RlIG9uIHRoaXMgcGF0aC4gIEl0DQo+IG1lYW5zIHdlIHJldHVybiBFUlJfUFRSKDApIHdo
aWNoIGlzIE5VTEwgYW5kIGl0IHJlc3VsdHMgaW4gYSBOVUxMDQo+IGRlcmVmZXJlbmNlIGluIHRo
ZSBjYWxsZXIuDQo+IA0KPiBGaXhlczogMmU1ZDRhOGY2MWRjICgiaXdsd2lmaTogcGNpZTogQWRk
IG5ldyBjb25maWd1cmF0aW9uIHRvIGVuYWJsZSBNU0lYIikNCj4gU2lnbmVkLW9mZi1ieTogRGFu
IENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPg0KPiANCj4gZGlmZiAtLWdpdCBh
L2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvcGNpZS90cmFucy5jIGIvZHJpdmVy
cy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9wY2llL3RyYW5zLmMNCj4gaW5kZXggOTJiM2E1
NWQwZmJjLi5mOTVlZWM1MjUwOGUgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNz
L2ludGVsL2l3bHdpZmkvcGNpZS90cmFucy5jDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNz
L2ludGVsL2l3bHdpZmkvcGNpZS90cmFucy5jDQo+IEBAIC0zMTUwLDcgKzMxNTAsOCBAQCBzdHJ1
Y3QgaXdsX3RyYW5zICppd2xfdHJhbnNfcGNpZV9hbGxvYyhzdHJ1Y3QgcGNpX2RldiAqcGRldiwN
Cj4gIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZ0cmFuc19wY2llLT5kMGkzX3dhaXRxKTsNCj4gIA0K
PiAgCWlmICh0cmFuc19wY2llLT5tc2l4X2VuYWJsZWQpIHsNCj4gLQkJaWYgKGl3bF9wY2llX2lu
aXRfbXNpeF9oYW5kbGVyKHBkZXYsIHRyYW5zX3BjaWUpKQ0KPiArCQlyZXQgPSBpd2xfcGNpZV9p
bml0X21zaXhfaGFuZGxlcihwZGV2LCB0cmFuc19wY2llKTsNCj4gKwkJaWYgKHJldCkNCj4gIAkJ
CWdvdG8gb3V0X25vX3BjaTsNCj4gIAkgfSBlbHNlIHsNCj4gIAkJcmV0ID0gaXdsX3BjaWVfYWxs
b2NfaWN0KHRyYW5zKTsNCg0KWW91IGFscmVhZHkgc2VudCBhbiBlcXVpdmFsZW50IHBhdGNoOg0K
DQpodHRwczovL3BhdGNod29yay5rZXJuZWwub3JnL3BhdGNoLzk4MjU4OTUvDQoNCkFuZCBJJ3Zl
IGFscmVhZHkgc2VudCBpdCBvdXQgdG8gYmUgYXBwbGllZCBpbiA0LjEzLXJjKi4gIEknbGwgc2Vu
ZCBhDQpwdWxsLXJlcSBmb3IgLWZpeGVzIGxhdGVyIHRoaXMgd2Vlay4NCg0KVGhhbmtzIGFueXdh
eS4gOikNCg0KLS0NCkNoZWVycywNCkx1Y2Eu