Revert "sysctl: Drop reference added by grab_header in proc_sys_readdir"

This reverts commit ae3ad84cc98a31bc65525115e61bd9f0c2334cc1. The commit
has a bogus CVE number which needs to be corrected. Simply changing the
metadata here.

Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 68c770854ba53dd991379fbf427d9a776ed895e7..fdda62e6115e1c4584cc88d360c27de7a26e1793 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -703,7 +703,7 @@ static int proc_sys_readdir(struct file *file, struct dir_context *ctx)
        ctl_dir = container_of(head, struct ctl_dir, header);
 
        if (!dir_emit_dots(file, ctx))
-               goto out;
+               return 0;
 
        pos = 2;
 
@@ -713,7 +713,6 @@ static int proc_sys_readdir(struct file *file, struct dir_context *ctx)
                        break;
                }
        }
-out:
        sysctl_head_finish(head);
        return 0;
 }