From patchwork Wed May 10 15:20:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 9720083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B12360236 for ; Wed, 10 May 2017 15:21:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DDD728608 for ; Wed, 10 May 2017 15:21:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02B6428610; Wed, 10 May 2017 15:21:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FBA128608 for ; Wed, 10 May 2017 15:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753707AbdEJPVh (ORCPT ); Wed, 10 May 2017 11:21:37 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33280 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753527AbdEJPVF (ORCPT ); Wed, 10 May 2017 11:21:05 -0400 Received: by mail-wm0-f67.google.com with SMTP id y10so537602wmh.0; Wed, 10 May 2017 08:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vgv4TIFQvFNwKSsCPGvd0ZiTwZGDo7wOT4veOKw1kj4=; b=f4iurtil01RhnhqJc+ySq3rofAMCFKV/QQAjMoxIujz7/FKliGCspdepfxp8K9JWxi POpVpyxlprovL9splZ3PQMvZ+89CdsG6Hjq1AwUE4ENk73eC947tVaMVbOEl3zzApEn9 dV3zkYvJW3lrsb8khT3edeSsTHWrMXSJEgBvJm2wNRsKkicfi4AnudegQbYoH2OUTMfD HSQEZEyE3CuSwQchiessyDjN8hb49Dvf7aYfebOdYgLC+JxXscP6SsQPeqXJRJ45aemH Me0Lx2evhCRzawPyV422At1zhOB/9c6A+3A90uyXvNT6M7l6RTP9+rwLLpZNgWISDy6N EHdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Vgv4TIFQvFNwKSsCPGvd0ZiTwZGDo7wOT4veOKw1kj4=; b=mm9nh3y1f8zqQU+o8MsQyh2PMc2SgwUCjwht2h/30vEht45bBhc8jrbhknqxd2x3Rz p9JehQQUPjlTKr042KFXkaUoHorQJ3weYhrNqWEzd54qZtjgmSz0hxIdyTdIwP5E3slo unipiaIGGOVnRbJjdIbq4BvgBNCimqdKWDK2rOfVi5Nhc8MSh348KaEXKSWawKOQP8Bg Pp4moIMWY7wbRz5Ylbla4kPyOgVXQQB67y3lNuSVpvBV7/5Ck3dlQQlogSe5d97S1+PT 5QGqvgeJlRyVkluMRdVUoM65f9mPkV3oCgHb7CjCWRUcuuDxIaqolu9J6aRdwWtXvQgU oGVQ== X-Gm-Message-State: AODbwcD6nmTa4tPkdhyTkFLs1IBk+1vX5Znar8snzSMpI1iQ6Dpmy0J4 /JTwNdV7Ke6HzJCPmvs= X-Received: by 10.25.163.134 with SMTP id m128mr3187504lfe.1.1494429657862; Wed, 10 May 2017 08:20:57 -0700 (PDT) Received: from smtp.gmail.com (msk-vpn.virtuozzo.com. [195.214.232.6]) by smtp.gmail.com with ESMTPSA id f88sm614089lfk.63.2017.05.10.08.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 08:20:57 -0700 (PDT) From: Dmitry Monakhov To: fstests@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, Dmitry Monakhov Subject: [PATCH 1/9] bio-integrity: Do not allocate integrity context for bio w/o data Date: Wed, 10 May 2017 19:20:44 +0400 Message-Id: <1494429652-9488-2-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1494429652-9488-1-git-send-email-dmonakhov@openvz.org> References: <1494429652-9488-1-git-send-email-dmonakhov@openvz.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If bio has no data, such as ones from blkdev_issue_flush(), then we have nothing to protect. This patch prevent bugon like follows: kfree_debugcheck: out of range ptr ac1fa1d106742a5ah kernel BUG at mm/slab.c:2773! invalid opcode: 0000 [#1] SMP Modules linked in: bcache CPU: 0 PID: 4428 Comm: xfs_io Tainted: G W 4.11.0-rc4-ext4-00041-g2ef0043-dirty #43 Hardware name: Virtuozzo KVM, BIOS seabios-1.7.5-11.vz7.4 04/01/2014 task: ffff880137786440 task.stack: ffffc90000ba8000 RIP: 0010:kfree_debugcheck+0x25/0x2a RSP: 0018:ffffc90000babde0 EFLAGS: 00010082 RAX: 0000000000000034 RBX: ac1fa1d106742a5a RCX: 0000000000000007 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88013f3ccb40 RBP: ffffc90000babde8 R08: 0000000000000000 R09: 0000000000000000 R10: 00000000fcb76420 R11: 00000000725172ed R12: 0000000000000282 R13: ffffffff8150e766 R14: ffff88013a145e00 R15: 0000000000000001 FS: 00007fb09384bf40(0000) GS:ffff88013f200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fd0172f9e40 CR3: 0000000137fa9000 CR4: 00000000000006f0 Call Trace: kfree+0xc8/0x1b3 bio_integrity_free+0xc3/0x16b bio_free+0x25/0x66 bio_put+0x14/0x26 blkdev_issue_flush+0x7a/0x85 blkdev_fsync+0x35/0x42 vfs_fsync_range+0x8e/0x9f vfs_fsync+0x1c/0x1e do_fsync+0x31/0x4a SyS_fsync+0x10/0x14 entry_SYSCALL_64_fastpath+0x1f/0xc2 Reviewed-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Reviewed-by: Martin K. Petersen Signed-off-by: Dmitry Monakhov --- block/bio-integrity.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 5384713..b5009a8 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -175,6 +175,9 @@ bool bio_integrity_enabled(struct bio *bio) if (bio_op(bio) != REQ_OP_READ && bio_op(bio) != REQ_OP_WRITE) return false; + if (!bio_sectors(bio)) + return false; + /* Already protected? */ if (bio_integrity(bio)) return false;