Messages in this thread | | | From | Richard Weinberger <> | Date | Wed, 23 Dec 2020 11:12:49 +0100 | Subject | Re: [PATCH -next] ubi: eba: Delete useless kfree code |
| |
On Wed, Dec 16, 2020 at 2:13 PM Zheng Yongjun <zhengyongjun3@huawei.com> wrote: > > The parameter of kfree function is NULL, so kfree code is useless, delete it. > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > --- > drivers/mtd/ubi/eba.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c > index 0edecfdbd01f..9c2840ffd2e9 100644 > --- a/drivers/mtd/ubi/eba.c > +++ b/drivers/mtd/ubi/eba.c > @@ -142,7 +142,6 @@ struct ubi_eba_table *ubi_eba_create_table(struct ubi_volume *vol, > return tbl; > > err: > - kfree(tbl->entries); > kfree(tbl); > > return ERR_PTR(err);
On Sat, Dec 19, 2020 at 1:52 PM Jubin Zhong <zhongjubin@huawei.com> wrote: > > data_size is already checked against zero when vol_type matches > UBI_VID_STATIC. Remove the following dead code. > > Signed-off-by: Jubin Zhong <zhongjubin@huawei.com> > --- > drivers/mtd/ubi/io.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c > index 2f3312c..8a7306c 100644 > --- a/drivers/mtd/ubi/io.c > +++ b/drivers/mtd/ubi/io.c > @@ -913,12 +913,7 @@ static int validate_vid_hdr(const struct ubi_device *ubi, > ubi_err(ubi, "bad data_size"); > goto bad; > } > - } else if (lnum == used_ebs - 1) { > - if (data_size == 0) { > - ubi_err(ubi, "bad data_size at last LEB"); > - goto bad; > - } > - } else { > + } else if (lnum > used_ebs - 1) { > ubi_err(ubi, "too high lnum"); > goto bad; > } > --
Looks good, applied to my 5.12 queue!
-- Thanks, //richard
| |