All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@openvz.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	Alexey Dobriyan <adobriyan@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Pavel Emelyanov <xemul@parallels.com>,
	James Bottomley <jbottomley@parallels.com>,
	Matthew Helsley <matt.helsley@gmail.com>,
	aneesh.kumar@linux.vnet.ibm.com, bfields@fieldses.org,
	Cyrill Gorcunov <gorcunov@openvz.org>,
	Al Viro <viro@ZenIV.linux.org.uk>
Subject: [patch 2/7] fs, exportfs: Escape nil dereference if no s_export_op present
Date: Mon, 12 Nov 2012 14:14:42 +0400	[thread overview]
Message-ID: <20121112101845.753952377@openvz.org> (raw)
In-Reply-To: 20121112101440.665694060@openvz.org

[-- Attachment #1: fs-exportfs-add-null-check --]
[-- Type: text/plain, Size: 1303 bytes --]

This routine will be used to generate a file handle in fdinfo
output for inotify subsystem, where if no s_export_op present
the general export_encode_fh should be used. Thus add
a test if s_export_op present inside exportfs_encode_fh itself.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
CC: Pavel Emelyanov <xemul@parallels.com>
CC: Al Viro <viro@ZenIV.linux.org.uk>
CC: Alexey Dobriyan <adobriyan@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: James Bottomley <jbottomley@parallels.com>
CC: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
CC: Alexey Dobriyan <adobriyan@gmail.com>
CC: Matthew Helsley <matt.helsley@gmail.com>
CC: "J. Bruce Fields" <bfields@fieldses.org>
CC: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
---
 fs/exportfs/expfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.git/fs/exportfs/expfs.c
===================================================================
--- linux-2.6.git.orig/fs/exportfs/expfs.c
+++ linux-2.6.git/fs/exportfs/expfs.c
@@ -357,7 +357,7 @@ int exportfs_encode_fh(struct dentry *de
 		 */
 		parent = p->d_inode;
 	}
-	if (nop->encode_fh)
+	if (nop && nop->encode_fh)
 		error = nop->encode_fh(inode, fid->raw, max_len, parent);
 	else
 		error = export_encode_fh(inode, fid, max_len, parent);

  parent reply	other threads:[~2012-11-12 10:14 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-12 10:14 [patch 0/7] Providing additional information in fdinfo sufficient for c/r Cyrill Gorcunov
2012-11-12 10:14 ` [patch 1/7] procfs: Add ability to plug in auxiliary fdinfo providers Cyrill Gorcunov
2012-11-13  0:40   ` Andrew Morton
2012-11-13  7:03     ` Cyrill Gorcunov
2012-11-12 10:14 ` Cyrill Gorcunov [this message]
2012-11-12 10:14 ` [patch 3/7] fs, notify: Add file handle entry into inotify_inode_mark Cyrill Gorcunov
2012-11-13  0:55   ` Andrew Morton
2012-11-13  7:20     ` Cyrill Gorcunov
2012-11-13  7:40       ` Andrew Morton
2012-11-13  8:00         ` Cyrill Gorcunov
2012-11-13  8:19           ` David Rientjes
2012-11-13  8:29             ` Cyrill Gorcunov
     [not found]               ` <2910785.4Vm74eFJyi@deuteros>
2012-11-13 14:40                 ` Cyrill Gorcunov
2012-11-13 15:02                   ` Tvrtko Ursulin
2012-11-13 15:28                     ` Cyrill Gorcunov
2012-11-14  9:20                       ` Tvrtko Ursulin
2012-11-14  9:38                         ` Cyrill Gorcunov
2012-11-14  9:50                           ` Tvrtko Ursulin
2012-11-14  9:58                             ` Cyrill Gorcunov
2012-11-14 10:08                               ` Tvrtko Ursulin
2012-11-14 10:13                                 ` Pavel Emelyanov
2012-11-14 10:38                                   ` Tvrtko Ursulin
2012-11-14 10:46                                     ` Pavel Emelyanov
2012-11-14 10:54                                       ` Tvrtko Ursulin
2012-11-14 10:56                                         ` Pavel Emelyanov
2012-11-14 11:03                                           ` Cyrill Gorcunov
2012-11-14 11:12                                           ` Tvrtko Ursulin
2012-11-14 12:45                                       ` J. Bruce Fields
2012-11-14 13:03                                         ` Cyrill Gorcunov
2012-11-14 13:26                                           ` J. Bruce Fields
2012-11-14 13:32                                             ` Cyrill Gorcunov
2012-11-13 22:38           ` Andrew Morton
2012-11-14  6:46             ` Cyrill Gorcunov
2012-11-14 10:10               ` Pavel Emelyanov
2012-11-14 10:13                 ` Cyrill Gorcunov
2012-11-12 10:14 ` [patch 4/7] fs, notify: Add procfs fdinfo helper v4 Cyrill Gorcunov
2012-11-13  1:00   ` Andrew Morton
2012-11-13  7:22     ` Cyrill Gorcunov
2012-11-12 10:14 ` [patch 5/7] fs, eventfd: Add procfs fdinfo helper Cyrill Gorcunov
2012-11-12 10:14 ` [patch 6/7] fs, epoll: Add procfs fdinfo helper v2 Cyrill Gorcunov
2012-11-12 10:14 ` [patch 7/7] fdinfo: Show sigmask for signalfd fd v2 Cyrill Gorcunov
2012-11-13  1:05   ` Andrew Morton
  -- strict thread matches above, loose matches on Subject: below --
2012-09-12 21:29 [patch 0/7] auxiliary fdinfo, new round Cyrill Gorcunov
2012-09-12 21:29 ` [patch 2/7] fs, exportfs: Escape nil dereference if no s_export_op present Cyrill Gorcunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121112101845.753952377@openvz.org \
    --to=gorcunov@openvz.org \
    --cc=adobriyan@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@linux.vnet.ibm.com \
    --cc=bfields@fieldses.org \
    --cc=jbottomley@parallels.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt.helsley@gmail.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=xemul@parallels.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.