Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sat, 19 Nov 2022 22:17:07 +0100 (CET)
From:   Richard Weinberger <richard@nod.at>
To:     George Kennedy <george.kennedy@oracle.com>
Cc:     Miquel Raynal <miquel.raynal@bootlin.com>,
        Vignesh Raghavendra <vigneshr@ti.com>,
        eorge kennedy <eorge.kennedy@oracle.com>,
        linux-mtd <linux-mtd@lists.infradead.org>,
        syzkaller@googlegroups.com,
        linux-kernel <linux-kernel@vger.kernel.org>,
        harshit m mogalapalli <harshit.m.mogalapalli@oracle.com>
Message-ID: <1124560008.256167.1668892627774.JavaMail.zimbra@nod.at>
In-Reply-To: <ae901608-0580-010a-26e3-99d0b704b88b@oracle.com>
References: <ae901608-0580-010a-26e3-99d0b704b88b@oracle.com>
Subject: Re: [PATCH] ubi: ensure that VID header offset + VID header size <=
 alloc, size
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8BIT
Thread-Topic: ensure that VID header offset + VID header size <= alloc, size
Thread-Index: 6xZXY6I9/ykjqNmmj3iJooHYp5bcjg==
Precedence: bulk

----- Ursprüngliche Mail -----
> Fixes: 801c135ce73d ("UBI: Unsorted Block Images")
> Reported-by: syzkaller <syzkaller@googlegroups.com>
> Signed-off-by: George Kennedy <george.kennedy@oracle.com>
> ---
>  drivers/mtd/ubi/build.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
> index a32050fecabf..53aa4de6b963 100644
> --- a/drivers/mtd/ubi/build.c
> +++ b/drivers/mtd/ubi/build.c
> @@ -663,6 +663,12 @@ static int io_init(struct ubi_device *ubi, int
> max_beb_per1024)
>  	ubi->ec_hdr_alsize = ALIGN(UBI_EC_HDR_SIZE, ubi->hdrs_min_io_size);
>  	ubi->vid_hdr_alsize = ALIGN(UBI_VID_HDR_SIZE, ubi->hdrs_min_io_size);
>  
> +	if (ubi->vid_hdr_offset && ((ubi->vid_hdr_offset + UBI_VID_HDR_SIZE) >
> +	    ubi->vid_hdr_alsize)) {
> +		ubi_err(ubi, "VID header offset %d too large.", ubi->vid_hdr_offset);
> +		return -EINVAL;
> +	}
> +

Thanks for fixing this, applied to the fixes branch.
That said, something broke whitespaces in your patch, I applied it manually.
Context lines before and after contain an extra space and caused both
git am and patch to give up.

Thanks,
//richard