Unverified Commit 3aad5766 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1424 [sync] PR-1354: ubi: Fix return value overwrite issue in try_write_vid_and_data() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1354 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5ZCWK7NT2Z3XREP2FML24JTJHAGYFVEH/ 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1424

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents cac47c69 95b2f1bd

drivers/mtd/ubi/eba.c

+14 −5
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static int try_write_vid_and_data(struct ubi_volume *vol, int lnum, 
				  int offset, int len)

{

	struct ubi_device *ubi = vol->ubi;

	int pnum, opnum, err, vol_id = vol->vol_id;

	int pnum, opnum, err, err2, vol_id = vol->vol_id;



	pnum = ubi_wl_get_peb(ubi);

	if (pnum < 0) {
@@ -982,10 +982,19 @@ static int try_write_vid_and_data(struct ubi_volume *vol, int lnum, 
out_put:

	up_read(&ubi->fm_eba_sem);



	if (err && pnum >= 0)

		err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);

	else if (!err && opnum >= 0)

		err = ubi_wl_put_peb(ubi, vol_id, lnum, opnum, 0);

	if (err && pnum >= 0) {

		err2 = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);

		if (err2) {

			ubi_warn(ubi, "failed to return physical eraseblock %d, error %d",

				 pnum, err2);

		}

	} else if (!err && opnum >= 0) {

		err2 = ubi_wl_put_peb(ubi, vol_id, lnum, opnum, 0);

		if (err2) {

			ubi_warn(ubi, "failed to return physical eraseblock %d, error %d",

				 opnum, err2);

		}

	}



	return err;

}