From mboxrd@z Thu Jan 1 00:00:00 1970 From: joeyli Subject: Re: [PATCH 4/5] efi: make our variable validation list include the guid (v2) Date: Thu, 4 Feb 2016 01:51:28 +0800 Message-ID: <20160203175128.GP26698@linux-rxt1.site> References: <1454517834-13736-1-git-send-email-pjones@redhat.com> <1454517834-13736-4-git-send-email-pjones@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1454517834-13736-4-git-send-email-pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Peter Jones Cc: Matt Fleming , linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-efi@vger.kernel.org Hi Peter,=20 On Wed, Feb 03, 2016 at 11:43:53AM -0500, Peter Jones wrote: > v2 correctly checks the guid for validation *as well as* attribute > whitelisting. >=20 > Signed-off-by: Peter Jones > --- > drivers/firmware/efi/efivars.c | 5 +++-- > drivers/firmware/efi/vars.c | 43 +++++++++++++++++++++++---------= ---------- > include/linux/efi.h | 3 ++- > 3 files changed, 29 insertions(+), 22 deletions(-) >=20 > diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/ef= ivars.c > index eef6331..707b0fd 100644 > --- a/drivers/firmware/efi/efivars.c > +++ b/drivers/firmware/efi/efivars.c > @@ -221,7 +221,7 @@ sanity_check(struct efi_variable *var, efi_char16= _t *name, efi_guid_t vendor, > } > =20 > if ((attributes & ~EFI_VARIABLE_MASK) !=3D 0 || > - efivar_validate(name, data, size) =3D=3D false) { > + efivar_validate(vendor, name, data, size) =3D=3D false) { > printk(KERN_ERR "efivars: Malformed variable content\n"); > return -EINVAL; > } > @@ -447,7 +447,8 @@ static ssize_t efivar_create(struct file *filp, s= truct kobject *kobj, > } > =20 > if ((attributes & ~EFI_VARIABLE_MASK) !=3D 0 || > - efivar_validate(name, data, size) =3D=3D false) { > + efivar_validate(new_var->var.VendorGuid, name, data, > + size) =3D=3D false) { I just built fail here: CC drivers/firmware/efi/efivars.o drivers/firmware/efi/efivars.c: In function =E2=80=98efivar_create=E2=80= =99: drivers/firmware/efi/efivars.c:450:29: error: =E2=80=98struct efi_varia= ble=E2=80=99 has no member named =E2=80=98var=E2=80=99 efivar_validate(new_var->var.VendorGuid, name, data, ^ scripts/Makefile.build:258: recipe for target 'drivers/firmware/efi/efi= vars.o' failed Regards Joey Lee