From e43d52df20082b62c172af70d7363f7f9d3f7487 Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Wed, 10 Mar 2021 14:19:16 +0900 Subject: [PATCH] Revert "mcexec_open_exec: make fput and add to mckernel_exec_files atomic" This reverts commit c80ea0ed23a9b48c2668388be1a38d5db0b21b33. Change-Id: I0541e8af5157c7128f8774f6581cc207d13b649a --- executer/kernel/mcctrl/control.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c index 849b9afb..3bac86db 100644 --- a/executer/kernel/mcctrl/control.c +++ b/executer/kernel/mcctrl/control.c @@ -2001,31 +2001,26 @@ int mcexec_open_exec(ihk_os_t os, char * __user filename) goto out_free; } - /* fget and list_add should be atomic */ - down(&mckernel_exec_file_lock); - file = open_exec(kfilename); retval = PTR_ERR(file); if (IS_ERR(file)) { - up(&mckernel_exec_file_lock); goto out_free; } fullpath = d_path(&file->f_path, pathbuf, PATH_MAX); if (IS_ERR(fullpath)) { - up(&mckernel_exec_file_lock); retval = PTR_ERR(fullpath); - goto out_put_file; + goto out_free; } mcef = kmalloc(sizeof(*mcef), GFP_KERNEL); if (!mcef) { - up(&mckernel_exec_file_lock); retval = -ENOMEM; goto out_put_file; } memset(mcef, 0, sizeof(struct mckernel_exec_file)); /* debug */ + down(&mckernel_exec_file_lock); /* Find previous file (if exists) and drop it */ list_for_each_entry(mcef_iter, &mckernel_exec_files, list) { if (mcef_iter->os == os && mcef_iter->pid == task_tgid_vnr(current)) {