From patchwork Mon Oct 13 15:07:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5076861 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA8A99F387 for ; Mon, 13 Oct 2014 15:07:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7F44201B9 for ; Mon, 13 Oct 2014 15:07:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6B9220176 for ; Mon, 13 Oct 2014 15:07:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752724AbaJMPH1 (ORCPT ); Mon, 13 Oct 2014 11:07:27 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:33069 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752509AbaJMPH0 (ORCPT ); Mon, 13 Oct 2014 11:07:26 -0400 Received: by mail-ig0-f170.google.com with SMTP id hn15so14050344igb.1 for ; Mon, 13 Oct 2014 08:07:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xALkg45fBTe877e5nUacEJgJG4OjsYQ0SeN30ViSuh4=; b=D96/8oM1ZVm1evTBLmjk4PVQpY9wrPL6EWvrwmqnOeqp+6ageunbR5Hf94itlkIBFR IUWDAdGpzs+1kRE+M7OGjT667xc47J6B9ugISdQGO9c2AN6seFOr53TSaRqxYYYWw/vr XSz1v4c+usJ+LG35vFqHHLhxpMmJsw6wpZwOXsvSdn7KhH7yEaXA/iYxLpPYRlDC9hux a4gocAqqMfBfY7pWWtcslgf/a5TNbpnHdWJN6+OYErmL71/Jy9ZToJcisCN20RK5jdts y/lZkM3eNcUPXwzwTkzFbWTskovONPv4quZYXIiqtyNR/dJ/UE/s13gwv4WwRLkxxlwO 29hA== X-Gm-Message-State: ALoCoQkqof13oMbqPargeps7RR5SzudxaSivyNmuBNm73nQQimkHC8iNdrjcqvjmXnNeoDlPdEzp X-Received: by 10.50.143.65 with SMTP id sc1mr2065486igb.27.1413212845364; Mon, 13 Oct 2014 08:07:25 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-73-190-61-247.hsd1.mi.comcast.net. [73.190.61.247]) by mx.google.com with ESMTPSA id 8sm4038722igy.0.2014.10.13.08.07.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Oct 2014 08:07:24 -0700 (PDT) From: Trond Myklebust To: Steve Dickson Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 1/2] NFS: Fix an uninitialised pointer Oops in the writeback error path Date: Mon, 13 Oct 2014 11:07:18 -0400 Message-Id: <1413212839-6665-1-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@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 SteveD reports the following Oops: RIP: 0010:[] [] __put_nfs_open_context+0x1d/0x100 [nfs] RSP: 0018:ffff880fed687b90 EFLAGS: 00010286 RAX: 0000000000000024 RBX: 0000000000000000 RCX: 0000000000000006 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 RBP: ffff880fed687bc0 R08: 0000000000000092 R09: 000000000000047a R10: 0000000000000000 R11: ffff880fed6878d6 R12: ffff880fed687d20 R13: ffff880fed687d20 R14: 0000000000000070 R15: ffffea000aa33ec0 FS: 00007fce290f0740(0000) GS:ffff8807ffc60000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000070 CR3: 00000007f2e79000 CR4: 00000000000007e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Stack: 0000000000000000 ffff880036c5e510 ffff880fed687d20 ffff880fed687d20 ffff880036c5e200 ffffea000aa33ec0 ffff880fed687bd0 ffffffffa0534710 ffff880fed687be8 ffffffffa053d5f0 ffff880036c5e200 ffff880fed687c08 Call Trace: [] put_nfs_open_context+0x10/0x20 [nfs] [] nfs_pgio_data_destroy+0x20/0x40 [nfs] [] nfs_pgio_error+0x22/0x40 [nfs] [] nfs_generic_pgio+0x74/0x2e0 [nfs] [] pnfs_generic_pg_writepages+0x63/0x210 [nfsv4] [] nfs_pageio_doio+0x19/0x50 [nfs] [] nfs_pageio_complete+0x24/0x30 [nfs] [] nfs_direct_write_schedule_iovec+0x115/0x1f0 [nfs] [] ? nfs_get_lock_context+0x4f/0x120 [nfs] [] nfs_file_direct_write+0x262/0x420 [nfs] [] nfs_file_write+0x131/0x1d0 [nfs] [] ? nfs_need_sync_write.isra.17+0x40/0x40 [nfs] [] do_io_submit+0x3b8/0x840 [] SyS_io_submit+0x10/0x20 [] system_call_fastpath+0x16/0x1b This is due to the calls to nfs_pgio_error() in nfs_generic_pgio(), which happen before the nfs_pgio_header's open context is referenced in nfs_pgio_rpcsetup(). Reported-by: Steve Dickson Cc: stable@vger.kernel.org # 3.16.x Signed-off-by: Trond Myklebust Tested-by: Steve Dickson --- fs/nfs/pagelist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 94e16ec88312..08085de879ed 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -526,7 +526,8 @@ EXPORT_SYMBOL_GPL(nfs_pgio_header_free); */ void nfs_pgio_data_destroy(struct nfs_pgio_header *hdr) { - put_nfs_open_context(hdr->args.context); + if (hdr->args.context) + put_nfs_open_context(hdr->args.context); if (hdr->page_array.pagevec != hdr->page_array.page_array) kfree(hdr->page_array.pagevec); }