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
| ||
|
Date: Tue, 31 Jan 2017 10:58:32 +0900 From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.kw@...achi.com> To: Anton Vorontsov <anton@...msg.org>, Colin Cross <ccross@...roid.com>, Kees Cook <keescook@...omium.org>, Tony Luck <tony.luck@...el.com> Cc: linux-kernel@...r.kernel.org, Nobuhiro Iwamatsu <nobuhiro.iwamatsu.kw@...achi.com>, Hiraku Toyooka <hiraku.toyooka.gu@...achi.com>, Mark Salyzyn <salyzyn@...roid.com>, Seiji Aguchi <seiji.aguchi.tr@...achi.com>, Shuah Khan <shuahkh@....samsung.com> Subject: [PATCH v4 2nd 1/4] ramoops: Add __ramoops_init_prz() as generic function This commit adds generic function __ramoops_init_prz() to reduce redundancy between ramoops_init_prz() and ramoops_init_przs(). Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.kw@...achi.com> Signed-off-by: Hiraku Toyooka <hiraku.toyooka.gu@...achi.com> Cc: Anton Vorontsov <anton@...msg.org> Cc: Colin Cross <ccross@...roid.com> Cc: Kees Cook <keescook@...omium.org> Cc: Mark Salyzyn <salyzyn@...roid.com> Cc: Seiji Aguchi <seiji.aguchi.tr@...achi.com> Cc: Shuah Khan <shuahkh@....samsung.com> Cc: Tony Luck <tony.luck@...el.com> V4: Rebase. V3: Rebase. Split patch. --- fs/pstore/ram.c | 73 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index a412aec848ce..72072e8123e3 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -520,6 +520,40 @@ static void ramoops_free_przs(struct persistent_ram_zone **przs) kfree(przs); } +static int __ramoops_init_prz(const char *name, + struct device *dev, struct ramoops_context *cxt, + struct persistent_ram_zone **prz, + phys_addr_t *paddr, size_t sz, u32 sig, + u32 flags, bool zap) +{ + if (!sz) + return 0; + + if (zap && *paddr + sz - cxt->phys_addr > cxt->size) { + dev_err(dev, "no room for %s mem region (0x%zx@...llx) in (0x%lx@...llx)\n", + name, sz, (unsigned long long)*paddr, + cxt->size, (unsigned long long)cxt->phys_addr); + return -ENOMEM; + } + + *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info, + cxt->memtype, flags); + if (IS_ERR(*prz)) { + int err = PTR_ERR(*prz); + + dev_err(dev, "failed to request %s mem region (0x%zx@...llx): %d\n", + name, sz, (unsigned long long)*paddr, err); + return err; + } + + if (zap) + persistent_ram_zap(*prz); + + *paddr += sz; + + return 0; +} + static int ramoops_init_przs(const char *name, struct device *dev, struct ramoops_context *cxt, struct persistent_ram_zone ***przs, @@ -580,15 +614,9 @@ static int ramoops_init_przs(const char *name, goto fail; for (i = 0; i < *cnt; i++) { - prz_ar[i] = persistent_ram_new(*paddr, zone_sz, sig, - &cxt->ecc_info, - cxt->memtype, flags); - if (IS_ERR(prz_ar[i])) { - err = PTR_ERR(prz_ar[i]); - dev_err(dev, "failed to request %s mem region (0x%zx@...llx): %d\n", - name, record_size, - (unsigned long long)*paddr, err); - + err = __ramoops_init_prz(name, dev, cxt, &prz_ar[i], paddr, + zone_sz, sig, flags, false); + if (err) { while (i > 0) { i--; persistent_ram_free(prz_ar[i]); @@ -596,7 +624,6 @@ static int ramoops_init_przs(const char *name, kfree(prz_ar); goto fail; } - *paddr += zone_sz; } *przs = prz_ar; @@ -612,31 +639,7 @@ static int ramoops_init_prz(const char *name, struct persistent_ram_zone **prz, phys_addr_t *paddr, size_t sz, u32 sig) { - if (!sz) - return 0; - - if (*paddr + sz - cxt->phys_addr > cxt->size) { - dev_err(dev, "no room for %s mem region (0x%zx@...llx) in (0x%lx@...llx)\n", - name, sz, (unsigned long long)*paddr, - cxt->size, (unsigned long long)cxt->phys_addr); - return -ENOMEM; - } - - *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info, - cxt->memtype, 0); - if (IS_ERR(*prz)) { - int err = PTR_ERR(*prz); - - dev_err(dev, "failed to request %s mem region (0x%zx@...llx): %d\n", - name, sz, (unsigned long long)*paddr, err); - return err; - } - - persistent_ram_zap(*prz); - - *paddr += sz; - - return 0; + return __ramoops_init_prz(name, dev, cxt, prz, paddr, sz, sig, 0, true); } static int ramoops_parse_dt_size(struct platform_device *pdev, -- 2.11.0
Powered by blists - more mailing lists