From a28398b3a2bff16457174932ab1d7f4e96542880 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 17 Dec 2014 15:25:29 +0100 Subject: [PATCH] userlandfs: NULL pointer dereference get_vnode could be called with a NULL privateNode in the kernel, but not in userlandfs. This would crash in cdda mount code (and from a grep search, also with several other filesystems). Now cdda can be mounted with userlandfs, and CDs read that way, but for some reason there is no CDDB renaming of the tracks in that case. --- .../file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp index d9b1a146f9..eff95419ee 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp @@ -204,7 +204,8 @@ get_vnode(fs_volume *_volume, ino_t vnodeID, void **privateNode) if (error != B_OK) return error; - *privateNode = ((HaikuKernelNode*)foundNode)->private_node; + if (privateNode) + *privateNode = ((HaikuKernelNode*)foundNode)->private_node; return B_OK; }