Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756150Ab2J2UYt (ORCPT ); Mon, 29 Oct 2012 16:24:49 -0400 Received: from mail-da0-f46.google.com ([209.85.210.46]:36923 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928Ab2J2UYr (ORCPT ); Mon, 29 Oct 2012 16:24:47 -0400 MIME-Version: 1.0 In-Reply-To: References: From: Mike Waychison Date: Mon, 29 Oct 2012 13:24:26 -0700 Message-ID: Subject: Re: [PATCH v3 7/7] Add a format check for an existing variable name at erasing time To: Seiji Aguchi Cc: "linux-kernel@vger.kernel.org" , "linux-efi@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "Luck, Tony (tony.luck@intel.com)" , "Matthew Garrett (mjg@redhat.com)" , "dzickus@redhat.com" , "dle-develop@lists.sourceforge.net" , Satoru Moriya Content-Type: text/plain; charset=ISO-8859-1 X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2898 Lines: 78 On Fri, Oct 26, 2012 at 2:43 PM, Seiji Aguchi wrote: > [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) This doesn't look right. This should probably mirror the sprintf() at the top of the function using a new string, convert it to 16-bit Unicodeand then compare it like we do for the 4-variable version above (please ignore the fact that this driver incorrectly calls these strings utf16 everywhere -- that needs to be fixed). > + 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/