From 2ca1479f72ad8ef59ae78dff0fbe4a51c6ff51f0 Mon Sep 17 00:00:00 2001 From: Anatolii Nikulin Date: Tue, 22 Dec 2015 13:51:41 +0300 Subject: [PATCH] [FIX] SVACE issue #27673 Change-Id: If6c9d86e0c088a25015ce42e960e346541828d2e Signed-off-by: Anatolii Nikulin --- preload/preload_debugfs.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/preload/preload_debugfs.c b/preload/preload_debugfs.c index 60bfd2c..791be82 100644 --- a/preload/preload_debugfs.c +++ b/preload/preload_debugfs.c @@ -252,11 +252,11 @@ static ssize_t bin_list_read(struct file *file, char __user *usr_buf, char *buf = NULL; char *ptr = NULL; - if (file->f_path.dentry == target_list) + if (file->f_path.dentry == target_list) { files_cnt = preload_control_get_target_names(&filenames); - else if (file->f_path.dentry == ignored_list) + } else if (file->f_path.dentry == ignored_list) { files_cnt = preload_control_get_ignored_names(&filenames); - else { + } else { /* Should never occur */ printk(PRELOAD_PREFIX "%s() called for invalid file %s!\n", __func__, file->f_path.dentry->d_name.name); @@ -289,26 +289,16 @@ static ssize_t bin_list_read(struct file *file, char __user *usr_buf, ptr += 1; } - if (file->f_path.dentry == target_list) - preload_control_release_target_names(&filenames); - else if (file->f_path.dentry == ignored_list) - preload_control_release_ignored_names(&filenames); - else { - /* Should never occur */ - printk(PRELOAD_PREFIX "%s() called for invalid file %s!\n", __func__, - file->f_path.dentry->d_name.name); - ret = 0; - goto bin_list_read_out; - } + ret = simple_read_from_buffer(usr_buf, count, ppos, buf, len); - return simple_read_from_buffer(usr_buf, count, ppos, buf, len); + kfree(buf); bin_list_read_fail: - if (file->f_path.dentry == target_list) + if (file->f_path.dentry == target_list) { preload_control_release_target_names(&filenames); - else if (file->f_path.dentry == ignored_list) + } else if (file->f_path.dentry == ignored_list) { preload_control_release_ignored_names(&filenames); - else { + } else { /* Should never occur */ printk(PRELOAD_PREFIX "%s() called for invalid file %s!\n", __func__, file->f_path.dentry->d_name.name); -- 2.7.4