Skip to content

Commit cba737f

Browse files
btw616jmberg-intel
authored andcommitted
um: Use err consistently in userspace()
Avoid declaring a new variable 'ret' inside the 'if (using_seccomp)' block, as the existing 'err' variable declared at the top of the function already serves the same purpose. Signed-off-by: Tiwei Bie <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 8129b9e commit cba737f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

arch/um/os-Linux/skas/process.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -592,12 +592,11 @@ void userspace(struct uml_pt_regs *regs)
592592
if (using_seccomp) {
593593
struct mm_id *mm_id = current_mm_id();
594594
struct stub_data *proc_data = (void *) mm_id->stack;
595-
int ret;
596595

597-
ret = set_stub_state(regs, proc_data, singlestepping());
598-
if (ret) {
596+
err = set_stub_state(regs, proc_data, singlestepping());
597+
if (err) {
599598
printk(UM_KERN_ERR "%s - failed to set regs: %d",
600-
__func__, ret);
599+
__func__, err);
601600
fatal_sigsegv();
602601
}
603602

@@ -623,10 +622,10 @@ void userspace(struct uml_pt_regs *regs)
623622
mm_id->syscall_data_len = 0;
624623
mm_id->syscall_fd_num = 0;
625624

626-
ret = get_stub_state(regs, proc_data, NULL);
627-
if (ret) {
625+
err = get_stub_state(regs, proc_data, NULL);
626+
if (err) {
628627
printk(UM_KERN_ERR "%s - failed to get regs: %d",
629-
__func__, ret);
628+
__func__, err);
630629
fatal_sigsegv();
631630
}
632631

0 commit comments

Comments
 (0)