| From d4bf205da618bbd0b038e404d646f14e76915718 Mon Sep 17 00:00:00 2001 |
| From: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> |
| Date: Sun, 12 Oct 2014 23:09:08 -0400 |
| Subject: pstore: Fix duplicate {console,ftrace}-efi entries |
| |
| From: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> |
| |
| commit d4bf205da618bbd0b038e404d646f14e76915718 upstream. |
| |
| The pstore filesystem still creates duplicate filename/inode pairs for |
| some pstore types. Add the id to the filename to prevent that. |
| |
| Before patch: |
| |
| [/sys/fs/pstore] ls -li |
| total 0 |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi |
| |
| After: |
| |
| [/sys/fs/pstore] ls -li |
| total 0 |
| 1232 -r--r--r--. 1 root root 148 Sep 29 17:09 console-efi-141202499100000 |
| 1231 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi-141202499200000 |
| 1230 -r--r--r--. 1 root root 148 Sep 29 17:44 console-efi-141202705400000 |
| 1229 -r--r--r--. 1 root root 67 Sep 29 17:44 console-efi-141202705500000 |
| 1228 -r--r--r--. 1 root root 67 Sep 29 20:42 console-efi-141203772600000 |
| 1227 -r--r--r--. 1 root root 148 Sep 29 23:42 console-efi-141204854900000 |
| 1226 -r--r--r--. 1 root root 67 Sep 29 23:42 console-efi-141204855000000 |
| 1225 -r--r--r--. 1 root root 148 Sep 29 23:59 console-efi-141204954200000 |
| 1224 -r--r--r--. 1 root root 67 Sep 29 23:59 console-efi-141204954400000 |
| |
| Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> |
| Acked-by: Kees Cook <keescook@chromium.org> |
| Signed-off-by: Tony Luck <tony.luck@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/pstore/inode.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/fs/pstore/inode.c |
| +++ b/fs/pstore/inode.c |
| @@ -320,10 +320,10 @@ int pstore_mkfile(enum pstore_type_id ty |
| compressed ? ".enc.z" : ""); |
| break; |
| case PSTORE_TYPE_CONSOLE: |
| - sprintf(name, "console-%s", psname); |
| + sprintf(name, "console-%s-%lld", psname, id); |
| break; |
| case PSTORE_TYPE_FTRACE: |
| - sprintf(name, "ftrace-%s", psname); |
| + sprintf(name, "ftrace-%s-%lld", psname, id); |
| break; |
| case PSTORE_TYPE_MCE: |
| sprintf(name, "mce-%s-%lld", psname, id); |