* [PATCH] ubi: remove dead code in validate_vid_hdr()
@ 2020-12-19 12:49 Jubin Zhong
2020-12-20 21:15 ` Richard Weinberger
0 siblings, 1 reply; 2+ messages in thread
From: Jubin Zhong @ 2020-12-19 12:49 UTC (permalink / raw)
To: richard, miquel.raynal, vigneshr; +Cc: wangfangpeng1, linux-mtd, linux-kernel
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;
}
--
1.8.5.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ubi: remove dead code in validate_vid_hdr()
2020-12-19 12:49 [PATCH] ubi: remove dead code in validate_vid_hdr() Jubin Zhong
@ 2020-12-20 21:15 ` Richard Weinberger
0 siblings, 0 replies; 2+ messages in thread
From: Richard Weinberger @ 2020-12-20 21:15 UTC (permalink / raw)
To: Jubin Zhong
Cc: Richard Weinberger, Miquel Raynal, Vignesh Raghavendra,
wangfangpeng1, linux-mtd, LKML
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-21 4:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-19 12:49 [PATCH] ubi: remove dead code in validate_vid_hdr() Jubin Zhong
2020-12-20 21:15 ` Richard Weinberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).