From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:64218 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755216Ab3IYUU6 (ORCPT ); Wed, 25 Sep 2013 16:20:58 -0400 From: Jeff Layton To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, andros@netapp.com Subject: [PATCH] nfs: fix NULL pointer dereference in nfs4_fl_prepare_ds Date: Wed, 25 Sep 2013 16:20:57 -0400 Message-Id: <1380140457-27408-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: In the event that there is an error connecting to a DS, we currently zero out the ds pointer and then try to dereference it to clear the NFS4DS_CONNECTING bit. Fix this by clearing the bit unconditionally before zeroing out the pointer. Cc: Andy Adamson Cc: # v3.10+ Signed-off-by: Jeff Layton --- fs/nfs/nfs4filelayoutdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c index 95604f6..816cda8 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c @@ -819,11 +819,11 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) int err; err = nfs4_ds_connect(s, ds); + nfs4_clear_ds_conn_bit(ds); if (err) { nfs4_mark_deviceid_unavailable(devid); ds = NULL; } - nfs4_clear_ds_conn_bit(ds); } else { /* Either ds is connected, or ds is NULL */ nfs4_wait_ds_connect(ds); -- 1.7.1