Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
To:     Dan Carpenter <dan.carpenter@oracle.com>
CC:     "ntfs3@lists.linux.dev" <ntfs3@lists.linux.dev>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "kernel-janitors@vger.kernel.org" <kernel-janitors@vger.kernel.org>
Subject: RE: [PATCH] fs/ntfs3: add checks for allocation failure
Thread-Topic: [PATCH] fs/ntfs3: add checks for allocation failure
Thread-Index: AQHXmN6VFXy+PyddQ0qyTjMLzsfUaKuHnNlw
Date:   Fri, 27 Aug 2021 17:16:57 +0000
Message-ID: <433bf776e8cf4fcc8dc9c1db4e43151b@paragon-software.com>
References: <20210824115236.GJ31143@kili>
In-Reply-To: <20210824115236.GJ31143@kili>
Accept-Language: ru-RU, en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Precedence: bulk

> From: Dan Carpenter <dan.carpenter@oracle.com>
> Sent: Tuesday, August 24, 2021 2:53 PM
> To: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
> Cc: ntfs3@lists.linux.dev; linux-kernel@vger.kernel.org; kernel-janitors@=
vger.kernel.org
> Subject: [PATCH] fs/ntfs3: add checks for allocation failure
>=20
> Add a check for when the kzalloc() in init_rsttbl() fails.  Some of
> the callers checked for NULL and some did not.  I went down the call
> tree and added NULL checks where ever they were missing.
>=20
> Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  fs/ntfs3/fslog.c | 21 ++++++++++++++++++---
>  1 file changed, 18 insertions(+), 3 deletions(-)
>=20
> diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
> index 397ba6a956e7..209fe6ddead0 100644
> --- a/fs/ntfs3/fslog.c
> +++ b/fs/ntfs3/fslog.c
> @@ -807,7 +807,11 @@ static inline struct RESTART_TABLE *init_rsttbl(u16 =
esize, u16 used)
>  	u32 off;
>  	u32 bytes =3D esize * used + sizeof(struct RESTART_TABLE);
>  	u32 lf =3D sizeof(struct RESTART_TABLE) + (used - 1) * esize;
> -	struct RESTART_TABLE *t =3D ntfs_zalloc(bytes);
> +	struct RESTART_TABLE *t;
> +
> +	t =3D ntfs_zalloc(bytes);
> +	if (!t)
> +		return NULL;
>=20
>  	t->size =3D cpu_to_le16(esize);
>  	t->used =3D cpu_to_le16(used);
> @@ -831,7 +835,11 @@ static inline struct RESTART_TABLE *extend_rsttbl(st=
ruct RESTART_TABLE *tbl,
>  	u16 esize =3D le16_to_cpu(tbl->size);
>  	__le32 osize =3D cpu_to_le32(bytes_per_rt(tbl));
>  	u32 used =3D le16_to_cpu(tbl->used);
> -	struct RESTART_TABLE *rt =3D init_rsttbl(esize, used + add);
> +	struct RESTART_TABLE *rt;
> +
> +	rt =3D init_rsttbl(esize, used + add);
> +	if (!rt)
> +		return NULL;
>=20
>  	memcpy(rt + 1, tbl + 1, esize * used);
>=20
> @@ -864,8 +872,11 @@ static inline void *alloc_rsttbl_idx(struct RESTART_=
TABLE **tbl)
>  	__le32 *e;
>  	struct RESTART_TABLE *t =3D *tbl;
>=20
> -	if (!t->first_free)
> +	if (!t->first_free) {
>  		*tbl =3D t =3D extend_rsttbl(t, 16, ~0u);
> +		if (!t)
> +			return NULL;
> +	}
>=20
>  	off =3D le32_to_cpu(t->first_free);
>=20
> @@ -4482,6 +4493,10 @@ int log_replay(struct ntfs_inode *ni, bool *initia=
lized)
>  		}
>=20
>  		dp =3D alloc_rsttbl_idx(&dptbl);
> +		if (!dp) {
> +			err =3D -ENOMEM;
> +			goto out;
> +		}
>  		dp->target_attr =3D cpu_to_le32(t16);
>  		dp->transfer_len =3D cpu_to_le32(t32 << sbi->cluster_bits);
>  		dp->lcns_follow =3D cpu_to_le32(t32);
> --
> 2.20.1

Hi Dan! Thanks, applied :)

Best regards