lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <5400324.7jYW1gKQ6y@vostro.rjw.lan> Date: Sat, 24 Oct 2015 17:24:17 +0200 From: "Rafael J. Wysocki" <rjw@...ysocki.net> To: Toshi Kani <toshi.kani@....com> Cc: akpm@...ux-foundation.org, dan.j.williams@...el.com, linux-mm@...ck.org, linux-nvdimm@...ts.01.org, linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org, Tony Luck <tony.luck@...el.com>, Borislav Petkov <bp@...en8.de> Subject: Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM On Friday, October 23, 2015 12:53:59 PM Toshi Kani wrote: > In the case of memory error injection, einj_error_inject() checks > if a target address is regular RAM. Update this check to add a call > to region_intersects_pmem() to verify if a target address range is > NVDIMM. This allows injecting a memory error to both RAM and NVDIMM > for testing. > > Also, the current RAM check, page_is_ram(), is replaced with > region_intersects_ram() so that it can verify a target address > range with the requested size. > > Signed-off-by: Toshi Kani <toshi.kani@....com> This is fine by me, but adding RAS maintainers Tony and Boris. Thanks, Rafael > --- > drivers/acpi/apei/einj.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c > index 0431883..ab55bbe 100644 > --- a/drivers/acpi/apei/einj.c > +++ b/drivers/acpi/apei/einj.c > @@ -519,7 +519,7 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, > u64 param3, u64 param4) > { > int rc; > - unsigned long pfn; > + u64 base_addr, size; > > /* If user manually set "flags", make sure it is legal */ > if (flags && (flags & > @@ -545,10 +545,14 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, > /* > * Disallow crazy address masks that give BIOS leeway to pick > * injection address almost anywhere. Insist on page or > - * better granularity and that target address is normal RAM. > + * better granularity and that target address is normal RAM or > + * NVDIMM. > */ > - pfn = PFN_DOWN(param1 & param2); > - if (!page_is_ram(pfn) || ((param2 & PAGE_MASK) != PAGE_MASK)) > + base_addr = param1 & param2; > + size = (~param2) + 1; > + if (((region_intersects_ram(base_addr, size) != REGION_INTERSECTS) && > + (region_intersects_pmem(base_addr, size) != REGION_INTERSECTS)) || > + ((param2 & PAGE_MASK) != PAGE_MASK)) > return -EINVAL; > > inject: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists