From patchwork Sat Apr 25 08:02:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 6274061 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6EE18BF4A6 for ; Sat, 25 Apr 2015 08:03:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9668820377 for ; Sat, 25 Apr 2015 08:03:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4E5120379 for ; Sat, 25 Apr 2015 08:03:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752471AbbDYIDS (ORCPT ); Sat, 25 Apr 2015 04:03:18 -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 Received: from 136.105-178-91.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([91.178.105.136]) by relay.skynet.be with ESMTP; 25 Apr 2015 10:03:14 +0200 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-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);