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

Commit 4d525145 authored by Julia Lawall's avatar Julia Lawall Committed by Artem Bityutskiy
Browse files

UBI: fix error return code 

Set the return variable to an error code as done elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
parent 802eee95

drivers/mtd/ubi/attach.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1453,8 +1453,10 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) 
		struct ubi_attach_info *scan_ai;

		struct ubi_attach_info *scan_ai;





		scan_ai = alloc_ai("ubi_ckh_aeb_slab_cache");

		scan_ai = alloc_ai("ubi_ckh_aeb_slab_cache");

		if (!scan_ai)

		if (!scan_ai) {

			err = -ENOMEM;

			goto out_wl;

			goto out_wl;

		}





		err = scan_all(ubi, scan_ai, 0);

		err = scan_all(ubi, scan_ai, 0);

		if (err) {

		if (err) {

drivers/mtd/ubi/build.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1245,8 +1245,10 @@ static int __init ubi_init(void) 
	ubi_wl_entry_slab = kmem_cache_create("ubi_wl_entry_slab",

	ubi_wl_entry_slab = kmem_cache_create("ubi_wl_entry_slab",

					      sizeof(struct ubi_wl_entry),

					      sizeof(struct ubi_wl_entry),

					      0, 0, NULL);

					      0, 0, NULL);

	if (!ubi_wl_entry_slab)

	if (!ubi_wl_entry_slab) {

		err = -ENOMEM;

		goto out_dev_unreg;

		goto out_dev_unreg;

	}





	err = ubi_debugfs_init();

	err = ubi_debugfs_init();

	if (err)

	if (err)