Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966602Ab2JZVn7 (ORCPT ); Fri, 26 Oct 2012 17:43:59 -0400 Received: from usindpps05.hds.com ([207.126.252.18]:56460 "EHLO usindpps05.hds.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964893Ab2JZVn5 convert rfc822-to-8bit (ORCPT ); Fri, 26 Oct 2012 17:43:57 -0400 From: Seiji Aguchi To: "linux-kernel@vger.kernel.org" , "linux-efi@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "mikew@google.com" , "Luck, Tony (tony.luck@intel.com)" , "Matthew Garrett (mjg@redhat.com)" , "dzickus@redhat.com" CC: "dle-develop@lists.sourceforge.net" , Satoru Moriya Subject: [PATCH v3 7/7] Add a format check for an existing variable name at erasing time Thread-Topic: [PATCH v3 7/7] Add a format check for an existing variable name at erasing time Thread-Index: Ac2zwvFR+xYuXJbURSmiNIlI2zWcyQ== Date: Fri, 26 Oct 2012 21:43:47 +0000 Message-ID: Accept-Language: ja-JP, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.74.43.113] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.7.7855,1.0.431,0.0.0000 definitions=2012-10-26_06:2012-10-26,2012-10-26,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_policy_notspam policy=outbound_policy score=0 spamscore=0 ipscore=0 suspectscore=1 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=6.0.2-1203120001 definitions=main-1210260270 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1998 Lines: 70 [Issue] A format of variable name has been updated to type, id, count and ctime to support holding multiple logs. Format of current variable name dump-type0-1-2-12345678 type:0 id:1 count:2 ctime:12345678 On the other hand, if an old variable name before being updated remains, users can't erase it via /dev/pstore. Format of old variable name dump-type0-1-12345678 type:0 id:1 ctime:12345678 [Solution] This patch adds a format check for the old variable name in a erase callback to make it erasable. Signed-off-by: Seiji Aguchi --- drivers/firmware/efivars.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index dd228d5..b1cd028 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -777,6 +777,8 @@ static int efi_pstore_erase(enum pstore_type_id type, u64 id, int count, struct efivars *efivars = psi->data; struct efivar_entry *entry, *found = NULL; int i; + unsigned int type_old, part_old; + unsigned long time_old; sprintf(name, "dump-type%u-%u-%d-%lu", type, (unsigned int)id, count, time.tv_sec); @@ -796,8 +798,16 @@ static int efi_pstore_erase(enum pstore_type_id type, u64 id, int count, if (efi_guidcmp(entry->var.VendorGuid, vendor)) continue; if (utf16_strncmp(entry->var.VariableName, efi_name, - utf16_strlen(efi_name))) - continue; + utf16_strlen(efi_name))) { + /* + * Check if an old format, + * which doesn't support holding + * multiple logs, remains. + */ + if (sscanf(name, "dump-type%u-%u-%lu", + &type_old, &part_old, &time_old) != 3) + continue; + } /* found */ found = entry; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/