Date: Sat, 6 Apr 2019 18:04:04 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345986 - head/sys/fs/fuse Message-ID: <201904061804.x36I44Wk018014@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Sat Apr 6 18:04:04 2019 New Revision: 345986 URL: https://svnweb.freebsd.org/changeset/base/345986 Log: fusefs: fix a panic on mount Don't page fault if the file descriptor provided with "-o fd" is invalid. This is a merge of r345419 from the projects/fuse2 branch. Reviewed by: ngie Tested by: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19836 Modified: head/sys/fs/fuse/fuse_vfsops.c Modified: head/sys/fs/fuse/fuse_vfsops.c ============================================================================== --- head/sys/fs/fuse/fuse_vfsops.c Sat Apr 6 17:21:05 2019 (r345985) +++ head/sys/fs/fuse/fuse_vfsops.c Sat Apr 6 18:04:04 2019 (r345986) @@ -225,7 +225,7 @@ fuse_vfsop_mount(struct mount *mp) size_t len; struct cdev *fdev; - struct fuse_data *data; + struct fuse_data *data = NULL; struct thread *td; struct file *fp, *fptmp; char *fspec, *subtype; @@ -361,7 +361,7 @@ fuse_vfsop_mount(struct mount *mp) out: if (err) { FUSE_LOCK(); - if (data->mp == mp) { + if (data != NULL && data->mp == mp) { /* * Destroy device only if we acquired reference to * it
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904061804.x36I44Wk018014>