ima: rename variable the seq_file "file" to "ima_kexec_file"

Before making the function local seq_file "file" variable file static
global, rename it to "ima_kexec_file".

Signed-off-by: Steven Chen <chenste@linux.microsoft.com>
Acked-by: Baoquan He <bhe@redhat.com>
Tested-by: Stefan Berger <stefanb@linux.ibm.com> # ppc64/kvm
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>

diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c
index 9d45f4d26f731658a79b94b9f95f4dcc4dcb6325..650beb74346c5e3dfeeab5535e50a39e5c0e90c5 100644 (file)
--- a/security/integrity/ima/ima_kexec.c
+++ b/security/integrity/ima/ima_kexec.c
@@ -18,30 +18,30 @@
 static int ima_dump_measurement_list(unsigned long *buffer_size, void **buffer,
                                     unsigned long segment_size)
 {
+       struct seq_file ima_kexec_file;
        struct ima_queue_entry *qe;
-       struct seq_file file;
        struct ima_kexec_hdr khdr;
        int ret = 0;
 
        /* segment size can't change between kexec load and execute */
-       file.buf = vmalloc(segment_size);
-       if (!file.buf) {
+       ima_kexec_file.buf = vmalloc(segment_size);
+       if (!ima_kexec_file.buf) {
                ret = -ENOMEM;
                goto out;
        }
 
-       file.file = NULL;
-       file.size = segment_size;
-       file.read_pos = 0;
-       file.count = sizeof(khdr);      /* reserved space */
+       ima_kexec_file.file = NULL;
+       ima_kexec_file.size = segment_size;
+       ima_kexec_file.read_pos = 0;
+       ima_kexec_file.count = sizeof(khdr);    /* reserved space */
 
        memset(&khdr, 0, sizeof(khdr));
        khdr.version = 1;
        /* This is an append-only list, no need to hold the RCU read lock */
        list_for_each_entry_rcu(qe, &ima_measurements, later, true) {
-               if (file.count < file.size) {
+               if (ima_kexec_file.count < ima_kexec_file.size) {
                        khdr.count++;
-                       ima_measurements_show(&file, qe);
+                       ima_measurements_show(&ima_kexec_file, qe);
                } else {
                        ret = -EINVAL;
                        break;
@@ -55,23 +55,24 @@ static int ima_dump_measurement_list(unsigned long *buffer_size, void **buffer,
         * fill in reserved space with some buffer details
         * (eg. version, buffer size, number of measurements)
         */
-       khdr.buffer_size = file.count;
+       khdr.buffer_size = ima_kexec_file.count;
        if (ima_canonical_fmt) {
                khdr.version = cpu_to_le16(khdr.version);
                khdr.count = cpu_to_le64(khdr.count);
                khdr.buffer_size = cpu_to_le64(khdr.buffer_size);
        }
-       memcpy(file.buf, &khdr, sizeof(khdr));
+       memcpy(ima_kexec_file.buf, &khdr, sizeof(khdr));
 
        print_hex_dump_debug("ima dump: ", DUMP_PREFIX_NONE, 16, 1,
-                            file.buf, file.count < 100 ? file.count : 100,
+                            ima_kexec_file.buf, ima_kexec_file.count < 100 ?
+                            ima_kexec_file.count : 100,
                             true);
 
-       *buffer_size = file.count;
-       *buffer = file.buf;
+       *buffer_size = ima_kexec_file.count;
+       *buffer = ima_kexec_file.buf;
 out:
        if (ret == -EINVAL)
-               vfree(file.buf);
+               vfree(ima_kexec_file.buf);
        return ret;
 }