Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753892AbbDYIDV (ORCPT ); Sat, 25 Apr 2015 04:03:21 -0400 Received: from mailrelay119.isp.belgacom.be ([195.238.20.146]:27017 "EHLO mailrelay119.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751644AbbDYIDP (ORCPT ); Sat, 25 Apr 2015 04:03:15 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=wisUSL2q+2X910teRg2xg/30tBFW7lBMAi45pEFXNHU= c=1 sm=2 a=R9mkRE9eMjjFMwgDAU8A:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CgDgAESjtV/4hpsltcgwyBLrRsBQGBApg9gTo8EQEBAQEBAQGBCkEFhDcjgRo3iC8ByFaGFoolHYQXBZwLjBuJOiNgZgGCLzwxgkQBAQE From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org Subject: [PATCH 1/1] Btrfs: avoid using NULL compressed_pages in insert_inline_extent() Date: Sat, 25 Apr 2015 10:02:54 +0200 Message-Id: <1429948974-24767-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1152 Lines: 37 insert_inline_extent() checked for compressed_pages to be NULL then it accessed it under compress_type != BTRFS_COMPRESS_NONE. This patch adds a BUG() when compress_size != 0, compress_type != BTRFS_COMPRESS_NONE and compressed_pages == 0. Signed-off-by: Fabian Frederick --- fs/btrfs/inode.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index ada4d24..449653d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -150,8 +150,12 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans, size_t cur_size = size; unsigned long offset; - if (compressed_size && compressed_pages) - cur_size = compressed_size; + if (compressed_size) { + if (compressed_pages) + cur_size = compressed_size; + else if (compress_type != BTRFS_COMPRESS_NONE) + BUG(); + } inode_add_bytes(inode, size); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/