| From 97246712c200a4ba588e8a6ffd6d15de8c9ce317 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 28 Nov 2018 11:20:03 +0800 |
| Subject: ubi: Do not drop UBI device reference before using |
| |
| From: Pan Bian <bianpan2016@163.com> |
| |
| [ Upstream commit e542087701f09418702673631a908429feb3eae0 ] |
| |
| The UBI device reference is dropped but then the device is used as a |
| parameter of ubi_err. The bug is introduced in changing ubi_err's |
| behavior. The old ubi_err does not require a UBI device as its first |
| parameter, but the new one does. |
| |
| Fixes: 32608703310 ("UBI: Extend UBI layer debug/messaging capabilities") |
| Signed-off-by: Pan Bian <bianpan2016@163.com> |
| Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com> |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mtd/ubi/kapi.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c |
| index 88b1897aeb40f..7826f7c4ec2fb 100644 |
| --- a/drivers/mtd/ubi/kapi.c |
| +++ b/drivers/mtd/ubi/kapi.c |
| @@ -227,9 +227,9 @@ out_unlock: |
| out_free: |
| kfree(desc); |
| out_put_ubi: |
| - ubi_put_device(ubi); |
| ubi_err(ubi, "cannot open device %d, volume %d, error %d", |
| ubi_num, vol_id, err); |
| + ubi_put_device(ubi); |
| return ERR_PTR(err); |
| } |
| EXPORT_SYMBOL_GPL(ubi_open_volume); |
| -- |
| 2.20.1 |
| |
