mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
![Kees Cook](/assets/img/avatar_default.png)
The kzalloc() function has a 2-factor argument form, kcalloc(). This patch replaces cases of: kzalloc(a * b, gfp) with: kcalloc(a * b, gfp) as well as handling cases of: kzalloc(a * b * c, gfp) with: kzalloc(array3_size(a, b, c), gfp) as it's slightly less ugly than: kzalloc_array(array_size(a, b), c, gfp) This does, however, attempt to ignore constant size factors like: kzalloc(4 * 1024, gfp) though any constants defined via macros get caught up in the conversion. Any factors with a sizeof() of "unsigned char", "char", and "u8" were dropped, since they're redundant. The Coccinelle script used for this was: // Fix redundant parens around sizeof(). @@ type TYPE; expression THING, E; @@ ( kzalloc( - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | kzalloc( - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression COUNT; typedef u8; typedef __u8; @@ ( kzalloc( - sizeof(u8) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(__u8) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(char) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(unsigned char) * (COUNT) + COUNT , ...) | kzalloc( - sizeof(u8) * COUNT + COUNT , ...) | kzalloc( - sizeof(__u8) * COUNT + COUNT , ...) | kzalloc( - sizeof(char) * COUNT + COUNT , ...) | kzalloc( - sizeof(unsigned char) * COUNT + COUNT , ...) ) // 2-factor product with sizeof(type/expression) and identifier or constant. @@ type TYPE; expression THING; identifier COUNT_ID; constant COUNT_CONST; @@ ( - kzalloc + kcalloc ( - sizeof(TYPE) * (COUNT_ID) + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * COUNT_ID + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * (COUNT_CONST) + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * COUNT_CONST + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (COUNT_ID) + COUNT_ID, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * COUNT_ID + COUNT_ID, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (COUNT_CONST) + COUNT_CONST, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * COUNT_CONST + COUNT_CONST, sizeof(THING) , ...) ) // 2-factor product, only identifiers. @@ identifier SIZE, COUNT; @@ - kzalloc + kcalloc ( - SIZE * COUNT + COUNT, SIZE , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( kzalloc( - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc( - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc( - sizeof(THING) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) ) // 3-factor product with 2 sizeof(variable), with redundant parens removed. @@ expression THING1, THING2; identifier COUNT; type TYPE1, TYPE2; @@ ( kzalloc( - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc( - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc( - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | kzalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) ) // 3-factor product, only identifiers, with redundant parens removed. @@ identifier STRIDE, SIZE, COUNT; @@ ( kzalloc( - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc( - COUNT * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) ) // Any remaining multi-factor products, first at least 3-factor products, // when they're not all constants... @@ expression E1, E2, E3; constant C1, C2, C3; @@ ( kzalloc(C1 * C2 * C3, ...) | kzalloc( - (E1) * E2 * E3 + array3_size(E1, E2, E3) , ...) | kzalloc( - (E1) * (E2) * E3 + array3_size(E1, E2, E3) , ...) | kzalloc( - (E1) * (E2) * (E3) + array3_size(E1, E2, E3) , ...) | kzalloc( - E1 * E2 * E3 + array3_size(E1, E2, E3) , ...) ) // And then all remaining 2 factors products when they're not all constants, // keeping sizeof() as the second factor argument. @@ expression THING, E1, E2; type TYPE; constant C1, C2, C3; @@ ( kzalloc(sizeof(THING) * C2, ...) | kzalloc(sizeof(TYPE) * C2, ...) | kzalloc(C1 * C2 * C3, ...) | kzalloc(C1 * C2, ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * (E2) + E2, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(TYPE) * E2 + E2, sizeof(TYPE) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * (E2) + E2, sizeof(THING) , ...) | - kzalloc + kcalloc ( - sizeof(THING) * E2 + E2, sizeof(THING) , ...) | - kzalloc + kcalloc ( - (E1) * E2 + E1, E2 , ...) | - kzalloc + kcalloc ( - (E1) * (E2) + E1, E2 , ...) | - kzalloc + kcalloc ( - E1 * E2 + E1, E2 , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org>
198 lines
4.8 KiB
C
198 lines
4.8 KiB
C
/*
|
|
* Copyright (c) 2015, Linaro Limited, Shannon Zhao
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/acpi.h>
|
|
#include <xen/xen.h>
|
|
#include <xen/page.h>
|
|
#include <xen/interface/memory.h>
|
|
#include <asm/xen/hypervisor.h>
|
|
#include <asm/xen/hypercall.h>
|
|
|
|
static int xen_unmap_device_mmio(const struct resource *resources,
|
|
unsigned int count)
|
|
{
|
|
unsigned int i, j, nr;
|
|
int rc = 0;
|
|
const struct resource *r;
|
|
struct xen_remove_from_physmap xrp;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
r = &resources[i];
|
|
nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
|
|
if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
|
|
continue;
|
|
|
|
for (j = 0; j < nr; j++) {
|
|
xrp.domid = DOMID_SELF;
|
|
xrp.gpfn = XEN_PFN_DOWN(r->start) + j;
|
|
rc = HYPERVISOR_memory_op(XENMEM_remove_from_physmap,
|
|
&xrp);
|
|
if (rc)
|
|
return rc;
|
|
}
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
static int xen_map_device_mmio(const struct resource *resources,
|
|
unsigned int count)
|
|
{
|
|
unsigned int i, j, nr;
|
|
int rc = 0;
|
|
const struct resource *r;
|
|
xen_pfn_t *gpfns;
|
|
xen_ulong_t *idxs;
|
|
int *errs;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
struct xen_add_to_physmap_range xatp = {
|
|
.domid = DOMID_SELF,
|
|
.space = XENMAPSPACE_dev_mmio
|
|
};
|
|
|
|
r = &resources[i];
|
|
nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
|
|
if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
|
|
continue;
|
|
|
|
gpfns = kcalloc(nr, sizeof(xen_pfn_t), GFP_KERNEL);
|
|
idxs = kcalloc(nr, sizeof(xen_ulong_t), GFP_KERNEL);
|
|
errs = kcalloc(nr, sizeof(int), GFP_KERNEL);
|
|
if (!gpfns || !idxs || !errs) {
|
|
kfree(gpfns);
|
|
kfree(idxs);
|
|
kfree(errs);
|
|
rc = -ENOMEM;
|
|
goto unmap;
|
|
}
|
|
|
|
for (j = 0; j < nr; j++) {
|
|
/*
|
|
* The regions are always mapped 1:1 to DOM0 and this is
|
|
* fine because the memory map for DOM0 is the same as
|
|
* the host (except for the RAM).
|
|
*/
|
|
gpfns[j] = XEN_PFN_DOWN(r->start) + j;
|
|
idxs[j] = XEN_PFN_DOWN(r->start) + j;
|
|
}
|
|
|
|
xatp.size = nr;
|
|
|
|
set_xen_guest_handle(xatp.gpfns, gpfns);
|
|
set_xen_guest_handle(xatp.idxs, idxs);
|
|
set_xen_guest_handle(xatp.errs, errs);
|
|
|
|
rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap_range, &xatp);
|
|
kfree(gpfns);
|
|
kfree(idxs);
|
|
kfree(errs);
|
|
if (rc)
|
|
goto unmap;
|
|
}
|
|
|
|
return rc;
|
|
|
|
unmap:
|
|
xen_unmap_device_mmio(resources, i);
|
|
return rc;
|
|
}
|
|
|
|
static int xen_platform_notifier(struct notifier_block *nb,
|
|
unsigned long action, void *data)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(data);
|
|
int r = 0;
|
|
|
|
if (pdev->num_resources == 0 || pdev->resource == NULL)
|
|
return NOTIFY_OK;
|
|
|
|
switch (action) {
|
|
case BUS_NOTIFY_ADD_DEVICE:
|
|
r = xen_map_device_mmio(pdev->resource, pdev->num_resources);
|
|
break;
|
|
case BUS_NOTIFY_DEL_DEVICE:
|
|
r = xen_unmap_device_mmio(pdev->resource, pdev->num_resources);
|
|
break;
|
|
default:
|
|
return NOTIFY_DONE;
|
|
}
|
|
if (r)
|
|
dev_err(&pdev->dev, "Platform: Failed to %s device %s MMIO!\n",
|
|
action == BUS_NOTIFY_ADD_DEVICE ? "map" :
|
|
(action == BUS_NOTIFY_DEL_DEVICE ? "unmap" : "?"),
|
|
pdev->name);
|
|
|
|
return NOTIFY_OK;
|
|
}
|
|
|
|
static struct notifier_block platform_device_nb = {
|
|
.notifier_call = xen_platform_notifier,
|
|
};
|
|
|
|
static int __init register_xen_platform_notifier(void)
|
|
{
|
|
if (!xen_initial_domain() || acpi_disabled)
|
|
return 0;
|
|
|
|
return bus_register_notifier(&platform_bus_type, &platform_device_nb);
|
|
}
|
|
|
|
arch_initcall(register_xen_platform_notifier);
|
|
|
|
#ifdef CONFIG_ARM_AMBA
|
|
#include <linux/amba/bus.h>
|
|
|
|
static int xen_amba_notifier(struct notifier_block *nb,
|
|
unsigned long action, void *data)
|
|
{
|
|
struct amba_device *adev = to_amba_device(data);
|
|
int r = 0;
|
|
|
|
switch (action) {
|
|
case BUS_NOTIFY_ADD_DEVICE:
|
|
r = xen_map_device_mmio(&adev->res, 1);
|
|
break;
|
|
case BUS_NOTIFY_DEL_DEVICE:
|
|
r = xen_unmap_device_mmio(&adev->res, 1);
|
|
break;
|
|
default:
|
|
return NOTIFY_DONE;
|
|
}
|
|
if (r)
|
|
dev_err(&adev->dev, "AMBA: Failed to %s device %s MMIO!\n",
|
|
action == BUS_NOTIFY_ADD_DEVICE ? "map" :
|
|
(action == BUS_NOTIFY_DEL_DEVICE ? "unmap" : "?"),
|
|
adev->dev.init_name);
|
|
|
|
return NOTIFY_OK;
|
|
}
|
|
|
|
static struct notifier_block amba_device_nb = {
|
|
.notifier_call = xen_amba_notifier,
|
|
};
|
|
|
|
static int __init register_xen_amba_notifier(void)
|
|
{
|
|
if (!xen_initial_domain() || acpi_disabled)
|
|
return 0;
|
|
|
|
return bus_register_notifier(&amba_bustype, &amba_device_nb);
|
|
}
|
|
|
|
arch_initcall(register_xen_amba_notifier);
|
|
#endif
|