Skip to contentSkip to conversation

kvm: properly check debugfs dentry before using it

PATCH Applied Greg Kroah-Hartman 3 participants 4 messages Feb 28, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm: properly check debugfs dentry before using it

debugfs can now report an error code if something went wrong instead of just NULL. So if the return value is to be used as a "real" dentry, it needs to be checked if it is an error before dereferencing it.

This is now happening because of ff9fb72bc077 ("debugfs: return error values, not NULL"). syzbot has found a way to trigger multiple debugfs files attempting to be created, which fails, and then the error code gets passed to dentry_path_raw() which obviously does not like it.

---

Linus, this should go in before 5.0-final is out, as it resolves a problem found by syzbot. Paolo has given his ack for me to send this directly to you. If you want this in [GIT PULL] format, I can do that as well.

 virt/kvm/kvm_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/kvm_main.c +1 -1
@@ -4044,7 +4044,7 @@ static void kvm_uevent_notify_change(uns
 	}
 	add_uevent_var(env, "PID=%d", kvm->userspace_pid);
 
-	if (kvm->debugfs_dentry) {
+	if (!IS_ERR_OR_NULL(kvm->debugfs_dentry)) {
 		char *tmp, *p = kmalloc(PATH_MAX, GFP_KERNEL);
 
 		if (p) {
#1 lore raw
Quoted 5 lines · Greg Kroah-Hartman

Linus, this should go in before 5.0-final is out, as it resolves a problem found by syzbot. Paolo has given his ack for me to send this directly to you. If you want this in [GIT PULL] format, I can do that as well.

Applied, thanks,

Linus

#2 lore raw
In reply to Greg Kroah-Hartman
Quoted 28 lines · Greg Kroah-Hartman

debugfs can now report an error code if something went wrong instead of just NULL. So if the return value is to be used as a "real" dentry, it needs to be checked if it is an error before dereferencing it.

This is now happening because of ff9fb72bc077 ("debugfs: return error values, not NULL"). syzbot has found a way to trigger multiple debugfs files attempting to be created, which fails, and then the error code gets passed to dentry_path_raw() which obviously does not like it.

---

Linus, this should go in before 5.0-final is out, as it resolves a problem found by syzbot. Paolo has given his ack for me to send this directly to you. If you want this in [GIT PULL] format, I can do that as well.

 virt/kvm/kvm_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

virt/kvm/kvm_main.c static void kvm_uevent_notify_change(uns · line 4050

Quoted 8 lines
virt/kvm/kvm_main.c +1 -1
@@ -4044,7 +4044,7 @@ static void kvm_uevent_notify_change(uns
 	}
 	add_uevent_var(env, "PID=%d", kvm->userspace_pid);
 
-	if (kvm->debugfs_dentry) {
+	if (!IS_ERR_OR_NULL(kvm->debugfs_dentry)) {
 		char *tmp, *p = kmalloc(PATH_MAX, GFP_KERNEL);
 
 		if (p) {

So what about the other checks of kvm->debugfs_dentry, in kvm_destroy_vm_debugfs() and kvm_create_vcpu_debugfs()?

- Eric

#3 lore raw
Quoted 32 lines · Eric Biggers
Quoted 31 lines · Greg Kroah-Hartman

debugfs can now report an error code if something went wrong instead of just NULL. So if the return value is to be used as a "real" dentry, it needs to be checked if it is an error before dereferencing it.

This is now happening because of ff9fb72bc077 ("debugfs: return error values, not NULL"). syzbot has found a way to trigger multiple debugfs files attempting to be created, which fails, and then the error code gets passed to dentry_path_raw() which obviously does not like it.

---

Linus, this should go in before 5.0-final is out, as it resolves a problem found by syzbot. Paolo has given his ack for me to send this directly to you. If you want this in [GIT PULL] format, I can do that as well.

 virt/kvm/kvm_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/kvm_main.c +0 -0
@@ -4044,7 +4044,7 @@ static void kvm_uevent_notify_change(uns
 	}
 	add_uevent_var(env, "PID=%d", kvm->userspace_pid);
 
Quoted 8 lines

virt/kvm/kvm_main.c static void kvm_uevent_notify_change(uns · line 4050

Quoted 5 lines
virt/kvm/kvm_main.c +1 -1
-	if (kvm->debugfs_dentry) {
+	if (!IS_ERR_OR_NULL(kvm->debugfs_dentry)) {
 		char *tmp, *p = kmalloc(PATH_MAX, GFP_KERNEL);
 
 		if (p) {

So what about the other checks of kvm->debugfs_dentry, in kvm_destroy_vm_debugfs() and kvm_create_vcpu_debugfs()?

Those are fine, they do not matter as they are only calling other debugfs calls which can handle error codes just fine. The only issue is when you try to use the dentry for something "real" like this that bad things can happen.

Luckily this was only the case in about 4 places in the kernel, all of which should be fixed now.

thanks,

greg k-h