VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   33 Branches   55 Tags
author: Jia-Ju Bai <baijiaju1990@gmail.com> 2019-10-06 17:57:57 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2019-10-07 15:47:19 -0700 commit: 2abb7d3b12d007c30193f48bebed781009bebdd2 parent: 583fee3e12df0e6f1f66f063b989d8e7fed0e65a
Commit Summary:
fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc()
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index d6f7b299eb23..efeea208fdeb 100644
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -283,7 +283,7 @@ static int ocfs2_info_scan_inode_alloc(struct ocfs2_super *osb,
 	if (inode_alloc)
 		inode_lock(inode_alloc);
 
-	if (o2info_coherent(&fi->ifi_req)) {
+	if (inode_alloc && o2info_coherent(&fi->ifi_req)) {
 		status = ocfs2_inode_lock(inode_alloc, &bh, 0);
 		if (status < 0) {
 			mlog_errno(status);