2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index 4b26ce48189b..8677fc6a545e 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -465,7 +465,7 @@ static int tpm_binary_bios_measurements_open(struct inode *inode,
                 return -ENOMEM;
 
         if ((err = read_log(log)))
-                return err;
+                goto out_free;
 
         /* now register seq file */
         err = seq_open(file, &tpm_binary_b_measurments_seqops);
@@ -473,10 +473,15 @@ static int tpm_binary_bios_measurements_open(struct inode *inode,
                 seq = file->private_data;
                 seq->private = log;
         } else {
-                kfree(log->bios_event_log);
-                kfree(log);
+                goto out_free;
         }
+
+out:
         return err;
+out_free:
+        kfree(log->bios_event_log);
+        kfree(log);
+        goto out;
 }
 
 const struct file_operations tpm_binary_bios_measurements_ops = {
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index 2565e1b6dd7b..d0e5c48e18c7 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -65,8 +65,8 @@ KERNEL_ATTR_RO(kexec_crash_loaded);
 /*
  * Make /sys/kernel/notes give the raw contents of our kernel .notes section.
  */
-extern const char __start_notes __attribute__((weak));
-extern const char __stop_notes __attribute__((weak));
+extern const void __start_notes __attribute__((weak));
+extern const void __stop_notes __attribute__((weak));
 #define notes_size (&__stop_notes - &__start_notes)
 
 static ssize_t notes_read(struct kobject *kobj, struct bin_attribute *bin_attr,