From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:54216 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932249AbbFWP0h (ORCPT ); Tue, 23 Jun 2015 11:26:37 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: Jan Kara , Jiri Slaby Subject: [patch added to the 3.12 stable tree] udf: Check length of extended attributes and allocation descriptors Date: Tue, 23 Jun 2015 17:26:36 +0200 Message-Id: <1435073196-1429-5-git-send-email-jslaby@suse.cz> In-Reply-To: <1435073196-1429-1-git-send-email-jslaby@suse.cz> References: <1435073196-1429-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org List-ID: From: Jan Kara This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit 23b133bdc452aa441fcb9b82cbf6dd05cfd342d0 upstream. Check length of extended attributes and allocation descriptors when loading inodes from disk. Otherwise corrupted filesystems could confuse the code and make the kernel oops. Reported-by: Carl Henrik Lunde Cc: stable@vger.kernel.org Signed-off-by: Jan Kara Signed-off-by: Jiri Slaby --- fs/udf/inode.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index cbc438e8f406..b0774f245199 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1493,6 +1493,15 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) iinfo->i_checkpoint = le32_to_cpu(efe->checkpoint); } + /* + * Sanity check length of allocation descriptors and extended attrs to + * avoid integer overflows + */ + if (iinfo->i_lenEAttr > bs || iinfo->i_lenAlloc > bs) + return; + /* Now do exact checks */ + if (udf_file_entry_alloc_offset(inode) + iinfo->i_lenAlloc > bs) + return; /* Sanity checks for files in ICB so that we don't get confused later */ if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) { /* -- 2.4.3