提交 f360724e 编写于 作者: Z Zhao Xuehui 提交者: Yang Yingliang

livepatch: Delete redundant variable 'flag'

hulk inclusion
category: bugfix
bugzilla: 51819
CVE: NA

---------------------------

The varible 'flag' in klp_try_enable_patch is assigned with
value '1', but that stored value is not used, so delete it.
Signed-off-by: NZhao Xuehui <zhaoxuehui1@huawei.com>
Reviewed-by: NYang Jihong <yangjihong1@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 0a03d546
...@@ -402,27 +402,23 @@ static int disable_patch(struct klp_patch *patch) ...@@ -402,27 +402,23 @@ static int disable_patch(struct klp_patch *patch)
int klp_try_disable_patch(void *data) int klp_try_disable_patch(void *data)
{ {
int ret = 0; int ret = 0;
int flag = 0;
struct patch_data *pd = (struct patch_data *)data; struct patch_data *pd = (struct patch_data *)data;
if (atomic_inc_return(&pd->cpu_count) == 1) { if (atomic_inc_return(&pd->cpu_count) == 1) {
struct klp_patch *patch = pd->patch; struct klp_patch *patch = pd->patch;
if (klp_check_patch_kprobed(patch)) { if (klp_check_patch_kprobed(patch)) {
flag = 1;
atomic_inc(&pd->cpu_count); atomic_inc(&pd->cpu_count);
return -EINVAL; return -EINVAL;
} }
ret = klp_check_calltrace(patch, 0); ret = klp_check_calltrace(patch, 0);
if (ret) { if (ret) {
flag = 1;
atomic_inc(&pd->cpu_count); atomic_inc(&pd->cpu_count);
return ret; return ret;
} }
ret = disable_patch(patch); ret = disable_patch(patch);
if (ret) { if (ret) {
flag = 1;
atomic_inc(&pd->cpu_count); atomic_inc(&pd->cpu_count);
return ret; return ret;
} }
...@@ -430,9 +426,7 @@ int klp_try_disable_patch(void *data) ...@@ -430,9 +426,7 @@ int klp_try_disable_patch(void *data)
} else { } else {
while (atomic_read(&pd->cpu_count) <= num_online_cpus()) while (atomic_read(&pd->cpu_count) <= num_online_cpus())
cpu_relax(); cpu_relax();
klp_smp_isb();
if (!flag)
klp_smp_isb();
} }
return ret; return ret;
...@@ -617,27 +611,23 @@ static int enable_patch(struct klp_patch *patch) ...@@ -617,27 +611,23 @@ static int enable_patch(struct klp_patch *patch)
int klp_try_enable_patch(void *data) int klp_try_enable_patch(void *data)
{ {
int ret = 0; int ret = 0;
int flag = 0;
struct patch_data *pd = (struct patch_data *)data; struct patch_data *pd = (struct patch_data *)data;
if (atomic_inc_return(&pd->cpu_count) == 1) { if (atomic_inc_return(&pd->cpu_count) == 1) {
struct klp_patch *patch = pd->patch; struct klp_patch *patch = pd->patch;
if (klp_check_patch_kprobed(patch)) { if (klp_check_patch_kprobed(patch)) {
flag = 1;
atomic_inc(&pd->cpu_count); atomic_inc(&pd->cpu_count);
return -EINVAL; return -EINVAL;
} }
ret = klp_check_calltrace(patch, 1); ret = klp_check_calltrace(patch, 1);
if (ret) { if (ret) {
flag = 1;
atomic_inc(&pd->cpu_count); atomic_inc(&pd->cpu_count);
return ret; return ret;
} }
ret = enable_patch(patch); ret = enable_patch(patch);
if (ret) { if (ret) {
flag = 1;
atomic_inc(&pd->cpu_count); atomic_inc(&pd->cpu_count);
return ret; return ret;
} }
...@@ -645,9 +635,7 @@ int klp_try_enable_patch(void *data) ...@@ -645,9 +635,7 @@ int klp_try_enable_patch(void *data)
} else { } else {
while (atomic_read(&pd->cpu_count) <= num_online_cpus()) while (atomic_read(&pd->cpu_count) <= num_online_cpus())
cpu_relax(); cpu_relax();
klp_smp_isb();
if (!flag)
klp_smp_isb();
} }
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册