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,
oleg@redhat.com, rientjes@google.com,
tvrtko.ursulin@onelan.co.uk,
Cyrill Gorcunov <gorcunov@openvz.org>,
Andrey Vagin <avagin@openvz.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: [patch 5/7] fs, exportfs: Escape nil dereference if no s_export_op present
Date: Wed, 14 Nov 2012 19:19:42 +0400 [thread overview]
Message-ID: <20121114152239.758426995@openvz.org> (raw)
In-Reply-To: 20121114151937.344922058@openvz.org
[-- Attachment #1: fs-exportfs-add-null-check --]
[-- Type: text/plain, Size: 1425 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: Oleg Nesterov <oleg@redhat.com>
CC: Andrey Vagin <avagin@openvz.org>
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>
CC: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk>
---
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);
next prev parent reply other threads:[~2012-11-14 15:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 15:19 [patch 0/7] Providing additional information in fdinfo sufficient for c/r, v3 Cyrill Gorcunov
2012-11-14 15:19 ` [patch 1/7] procfs: Add ability to plug in auxiliary fdinfo providers Cyrill Gorcunov
2012-11-15 13:47 ` Pavel Emelyanov
2012-11-14 15:19 ` [patch 2/7] fs, eventfd: Add procfs fdinfo helper Cyrill Gorcunov
2012-11-15 13:48 ` Pavel Emelyanov
2012-11-14 15:19 ` [patch 3/7] fs, epoll: Add procfs fdinfo helper v2 Cyrill Gorcunov
2012-11-15 13:49 ` Pavel Emelyanov
2012-11-14 15:19 ` [patch 4/7] fdinfo: Show sigmask for signalfd fd v3 Cyrill Gorcunov
2012-11-15 13:49 ` Pavel Emelyanov
2012-11-14 15:19 ` Cyrill Gorcunov [this message]
2012-11-15 13:49 ` [patch 5/7] fs, exportfs: Escape nil dereference if no s_export_op present Pavel Emelyanov
2012-11-14 15:19 ` [patch 6/7] fs, exportfs: Add exportfs_encode_inode_fh helper Cyrill Gorcunov
2012-11-14 17:37 ` J. Bruce Fields
2012-11-15 13:50 ` Pavel Emelyanov
2012-11-14 15:19 ` [patch 7/7] fs, notify: Add procfs fdinfo helper v6 Cyrill Gorcunov
2012-11-15 13:50 ` Pavel Emelyanov
2012-11-16 23:56 ` Andrew Morton
2012-11-17 7:10 ` Cyrill Gorcunov
2012-11-17 8:34 ` Cyrill Gorcunov
2012-11-20 0:49 ` Andrew Morton
2012-11-20 6:35 ` Cyrill Gorcunov
2012-12-10 2:21 ` Jan Engelhardt
2012-12-10 6:47 ` Cyrill Gorcunov
2012-11-27 0:41 ` Andrew Morton
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=20121114152239.758426995@openvz.org \
--to=gorcunov@openvz.org \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=avagin@openvz.org \
--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=oleg@redhat.com \
--cc=rientjes@google.com \
--cc=tvrtko.ursulin@onelan.co.uk \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).