From patchwork Mon Dec 20 19:15:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 422111 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBL0RA8t011307 for ; Tue, 21 Dec 2010 00:31:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932881Ab0LTTPf (ORCPT ); Mon, 20 Dec 2010 14:15:35 -0500 Received: from cobra.newdream.net ([66.33.216.30]:41945 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932899Ab0LTTPe (ORCPT ); Mon, 20 Dec 2010 14:15:34 -0500 Received: from localhost.localdomain (ip-66-33-206-8.dreamhost.com [66.33.206.8]) by cobra.newdream.net (Postfix) with ESMTPA id 3BB74BC922; Mon, 20 Dec 2010 11:20:58 -0800 (PST) From: Sage Weil To: ceph-devel@vger.kernel.org Cc: Sage Weil Subject: [PATCH 3/5] ceph: fix null pointer dereference in ceph_init_dentry for nfs reexport Date: Mon, 20 Dec 2010 11:15:29 -0800 Message-Id: <1292872531-18396-4-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1292872531-18396-3-git-send-email-sage@newdream.net> References: <1292872531-18396-1-git-send-email-sage@newdream.net> <1292872531-18396-2-git-send-email-sage@newdream.net> <1292872531-18396-3-git-send-email-sage@newdream.net> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 00:31:04 +0000 (UTC) diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 158c700..d902948 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -40,7 +40,8 @@ int ceph_init_dentry(struct dentry *dentry) if (dentry->d_fsdata) return 0; - if (ceph_snap(dentry->d_parent->d_inode) == CEPH_NOSNAP) + if (dentry->d_parent == NULL || /* nfs fh_to_dentry */ + ceph_snap(dentry->d_parent->d_inode) == CEPH_NOSNAP) dentry->d_op = &ceph_dentry_ops; else if (ceph_snap(dentry->d_parent->d_inode) == CEPH_SNAPDIR) dentry->d_op = &ceph_snapdir_dentry_ops;