[PATCH] ath10k: add missing mutex unlock on failpath

[PATCH] ath10k: add missing mutex unlock on failpath

[Michal Kazior]

Kernel would complain about leaving a held lock
after going back to userspace and would
subsequently deadlock.

Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 9bca37820848..64674c955d44 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4144,7 +4144,8 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
 
 	if (ar->num_peers >= ar->max_num_peers) {
 		ath10k_warn(ar, "refusing vdev creation due to insufficient peer entry resources in firmware\n");
-		return -ENOBUFS;
+		ret = -ENOBUFS;
+		goto err;
 	}
 
 	if (ar->free_vdev_map == 0) {
-- 
2.1.4

[PATCH] ath10k: add missing mutex unlock on failpath

[Michal Kazior]

Kernel would complain about leaving a held lock
after going back to userspace and would
subsequently deadlock.

Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 9bca37820848..64674c955d44 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4144,7 +4144,8 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
 
 	if (ar->num_peers >= ar->max_num_peers) {
 		ath10k_warn(ar, "refusing vdev creation due to insufficient peer entry resources in firmware\n");
-		return -ENOBUFS;
+		ret = -ENOBUFS;
+		goto err;
 	}
 
 	if (ar->free_vdev_map == 0) {
-- 
2.1.4


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Re: [PATCH] ath10k: add missing mutex unlock on failpath

[Kalle Valo]

Michal Kazior <michal.kazior@tieto.com> writes:

> Kernel would complain about leaving a held lock
> after going back to userspace and would
> subsequently deadlock.
>
> Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

commit e04cafbc38c7 is currently going to 4.3-rc1 (it's in
wireless-drivers-next currently). I think we should send this to 4.3 as
well, right?

-- 
Kalle Valo

Re: [PATCH] ath10k: add missing mutex unlock on failpath

[Kalle Valo]

Michal Kazior <michal.kazior@tieto.com> writes:

> Kernel would complain about leaving a held lock
> after going back to userspace and would
> subsequently deadlock.
>
> Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

commit e04cafbc38c7 is currently going to 4.3-rc1 (it's in
wireless-drivers-next currently). I think we should send this to 4.3 as
well, right?

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Re: [PATCH] ath10k: add missing mutex unlock on failpath

[Michal Kazior]

On 19 August 2015 at 13:23, Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> Michal Kazior <michal.kazior@tieto.com> writes:
>
>> Kernel would complain about leaving a held lock
>> after going back to userspace and would
>> subsequently deadlock.
>>
>> Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
>> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
>> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
>
> commit e04cafbc38c7 is currently going to 4.3-rc1 (it's in
> wireless-drivers-next currently). I think we should send this to 4.3 as
> well, right?

It does make sense to do so, yes.


Michał

Re: [PATCH] ath10k: add missing mutex unlock on failpath

[Michal Kazior]

On 19 August 2015 at 13:23, Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> Michal Kazior <michal.kazior@tieto.com> writes:
>
>> Kernel would complain about leaving a held lock
>> after going back to userspace and would
>> subsequently deadlock.
>>
>> Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
>> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
>> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
>
> commit e04cafbc38c7 is currently going to 4.3-rc1 (it's in
> wireless-drivers-next currently). I think we should send this to 4.3 as
> well, right?

It does make sense to do so, yes.


Michał

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Re: [PATCH] ath10k: add missing mutex unlock on failpath

[Kalle Valo]

Michal Kazior <michal.kazior@tieto.com> writes:

> Kernel would complain about leaving a held lock
> after going back to userspace and would
> subsequently deadlock.
>
> Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

Thanks, applied.

-- 
Kalle Valo

Re: [PATCH] ath10k: add missing mutex unlock on failpath

[Kalle Valo]

Michal Kazior <michal.kazior@tieto.com> writes:

> Kernel would complain about leaving a held lock
> after going back to userspace and would
> subsequently deadlock.
>
> Fixes: e04cafbc38c7 ("ath10k: fix peer limit enforcement")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

Thanks, applied.

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k