On Thu, Aug 23, 2012 at 08:12:30AM -0400, J. Bruce Fields wrote:
> On Thu, Aug 23, 2012 at 02:43:27PM +0400, Cyrill Gorcunov wrote:
> > If there is no s_export_op present in a target superblock
> > we might have nil dereference.
>
> Is that NULL dereference possible with current code, or is it a check
> you're adding to account for a new caller that you're about to add?
>
> I believe it's the latter, but this would be a good thing to make clear
> in the changelog.
With the current code it seems to be impossible (well, i can't be sure
about nfs caller) because do_sys_name_to_handle does check for s_export_op
to exist. Updated changelog below. After all I think not checking
s_export_op was a mistake in general -- this routine is exported to
other modules but has no a single line of comment about possibility
of nil dereference.
---
From: Cyrill Gorcunov <gorcu...@openvz.org>
Subject: fs, exportfs: Escape nil dereference if no s_export_op present
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 <gorcu...@openvz.org>
CC: Pavel Emelyanov <xe...@parallels.com>
CC: Al Viro <v...@zeniv.linux.org.uk>
CC: Alexey Dobriyan <adobri...@gmail.com>
CC: Andrew Morton <a...@linux-foundation.org>
CC: James Bottomley <jbottom...@parallels.com>
CC: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
CC: Alexey Dobriyan <adobri...@gmail.com>
CC: Matthew Helsley <matt.hels...@gmail.com>
CC: "J. Bruce Fields" <bfie...@fieldses.org>
CC: "Aneesh Kumar K.V" <aneesh.ku...@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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
