Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <1532114359.21552.41.camel@codethink.co.uk>
Subject: Re: [PATCH 4.4 095/105] udf: Detect incorrect directory size
From:   Ben Hutchings <ben.hutchings@codethink.co.uk>
To:     Anatoly Trosinenko <anatoly.trosinenko@gmail.com>,
        Jan Kara <jack@suse.cz>
Cc:     stable@vger.kernel.org,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org
Date:   Fri, 20 Jul 2018 20:19:19 +0100
In-Reply-To: <20180701153156.210980281@linuxfoundation.org>
References: <20180701153149.382300170@linuxfoundation.org>
         <20180701153156.210980281@linuxfoundation.org>
Organization: Codethink Ltd.
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, 2018-07-01 at 18:02 +0200, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Jan Kara <jack@suse.cz>
> 
> commit fa65653e575fbd958bdf5fb9c4a71a324e39510d upstream.
> 
> Detect when a directory entry is (possibly partially) beyond directory
> size and return EIO in that case since it means the filesystem is
> corrupted. Otherwise directory operations can further corrupt the
> directory and possibly also oops the kernel.
[...]
> --- a/fs/udf/directory.c
> +++ b/fs/udf/directory.c
> @@ -150,6 +150,9 @@ struct fileIdentDesc *udf_fileident_read
>  			       sizeof(struct fileIdentDesc));
>  		}
>  	}
> +	/* Got last entry outside of dir size - fs is corrupted! */
> +	if (*nf_pos > dir->i_size)
> +		return NULL;
>  	return fi;
>  }
>  

Is the same check needed when iinfo->i_alloc_type ==
ICBTAG_FLAG_AD_IN_ICB?

Ben.

-- 
Ben Hutchings, Software Developer                         Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom