mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 14:41:39 +00:00
6396bb2215
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>
241 lines
5.8 KiB
C
241 lines
5.8 KiB
C
/*
|
|
* Flash partitions described by the OF (or flattened) device tree
|
|
*
|
|
* Copyright © 2006 MontaVista Software Inc.
|
|
* Author: Vitaly Wool <vwool@ru.mvista.com>
|
|
*
|
|
* Revised to handle newer style flash binding by:
|
|
* Copyright © 2007 David Gibson, IBM Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/of.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/mtd/partitions.h>
|
|
|
|
static bool node_has_compatible(struct device_node *pp)
|
|
{
|
|
return of_get_property(pp, "compatible", NULL);
|
|
}
|
|
|
|
static int parse_fixed_partitions(struct mtd_info *master,
|
|
const struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct mtd_partition *parts;
|
|
struct device_node *mtd_node;
|
|
struct device_node *ofpart_node;
|
|
const char *partname;
|
|
struct device_node *pp;
|
|
int nr_parts, i, ret = 0;
|
|
bool dedicated = true;
|
|
|
|
|
|
/* Pull of_node from the master device node */
|
|
mtd_node = mtd_get_of_node(master);
|
|
if (!mtd_node)
|
|
return 0;
|
|
|
|
ofpart_node = of_get_child_by_name(mtd_node, "partitions");
|
|
if (!ofpart_node) {
|
|
/*
|
|
* We might get here even when ofpart isn't used at all (e.g.,
|
|
* when using another parser), so don't be louder than
|
|
* KERN_DEBUG
|
|
*/
|
|
pr_debug("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n",
|
|
master->name, mtd_node);
|
|
ofpart_node = mtd_node;
|
|
dedicated = false;
|
|
} else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) {
|
|
/* The 'partitions' subnode might be used by another parser */
|
|
return 0;
|
|
}
|
|
|
|
/* First count the subnodes */
|
|
nr_parts = 0;
|
|
for_each_child_of_node(ofpart_node, pp) {
|
|
if (!dedicated && node_has_compatible(pp))
|
|
continue;
|
|
|
|
nr_parts++;
|
|
}
|
|
|
|
if (nr_parts == 0)
|
|
return 0;
|
|
|
|
parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
|
|
if (!parts)
|
|
return -ENOMEM;
|
|
|
|
i = 0;
|
|
for_each_child_of_node(ofpart_node, pp) {
|
|
const __be32 *reg;
|
|
int len;
|
|
int a_cells, s_cells;
|
|
|
|
if (!dedicated && node_has_compatible(pp))
|
|
continue;
|
|
|
|
reg = of_get_property(pp, "reg", &len);
|
|
if (!reg) {
|
|
if (dedicated) {
|
|
pr_debug("%s: ofpart partition %pOF (%pOF) missing reg property.\n",
|
|
master->name, pp,
|
|
mtd_node);
|
|
goto ofpart_fail;
|
|
} else {
|
|
nr_parts--;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
a_cells = of_n_addr_cells(pp);
|
|
s_cells = of_n_size_cells(pp);
|
|
if (len / 4 != a_cells + s_cells) {
|
|
pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n",
|
|
master->name, pp,
|
|
mtd_node);
|
|
goto ofpart_fail;
|
|
}
|
|
|
|
parts[i].offset = of_read_number(reg, a_cells);
|
|
parts[i].size = of_read_number(reg + a_cells, s_cells);
|
|
parts[i].of_node = pp;
|
|
|
|
partname = of_get_property(pp, "label", &len);
|
|
if (!partname)
|
|
partname = of_get_property(pp, "name", &len);
|
|
parts[i].name = partname;
|
|
|
|
if (of_get_property(pp, "read-only", &len))
|
|
parts[i].mask_flags |= MTD_WRITEABLE;
|
|
|
|
if (of_get_property(pp, "lock", &len))
|
|
parts[i].mask_flags |= MTD_POWERUP_LOCK;
|
|
|
|
i++;
|
|
}
|
|
|
|
if (!nr_parts)
|
|
goto ofpart_none;
|
|
|
|
*pparts = parts;
|
|
return nr_parts;
|
|
|
|
ofpart_fail:
|
|
pr_err("%s: error parsing ofpart partition %pOF (%pOF)\n",
|
|
master->name, pp, mtd_node);
|
|
ret = -EINVAL;
|
|
ofpart_none:
|
|
of_node_put(pp);
|
|
kfree(parts);
|
|
return ret;
|
|
}
|
|
|
|
static const struct of_device_id parse_ofpart_match_table[] = {
|
|
{ .compatible = "fixed-partitions" },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, parse_ofpart_match_table);
|
|
|
|
static struct mtd_part_parser ofpart_parser = {
|
|
.parse_fn = parse_fixed_partitions,
|
|
.name = "fixed-partitions",
|
|
.of_match_table = parse_ofpart_match_table,
|
|
};
|
|
|
|
static int parse_ofoldpart_partitions(struct mtd_info *master,
|
|
const struct mtd_partition **pparts,
|
|
struct mtd_part_parser_data *data)
|
|
{
|
|
struct mtd_partition *parts;
|
|
struct device_node *dp;
|
|
int i, plen, nr_parts;
|
|
const struct {
|
|
__be32 offset, len;
|
|
} *part;
|
|
const char *names;
|
|
|
|
/* Pull of_node from the master device node */
|
|
dp = mtd_get_of_node(master);
|
|
if (!dp)
|
|
return 0;
|
|
|
|
part = of_get_property(dp, "partitions", &plen);
|
|
if (!part)
|
|
return 0; /* No partitions found */
|
|
|
|
pr_warn("Device tree uses obsolete partition map binding: %pOF\n", dp);
|
|
|
|
nr_parts = plen / sizeof(part[0]);
|
|
|
|
parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
|
|
if (!parts)
|
|
return -ENOMEM;
|
|
|
|
names = of_get_property(dp, "partition-names", &plen);
|
|
|
|
for (i = 0; i < nr_parts; i++) {
|
|
parts[i].offset = be32_to_cpu(part->offset);
|
|
parts[i].size = be32_to_cpu(part->len) & ~1;
|
|
/* bit 0 set signifies read only partition */
|
|
if (be32_to_cpu(part->len) & 1)
|
|
parts[i].mask_flags = MTD_WRITEABLE;
|
|
|
|
if (names && (plen > 0)) {
|
|
int len = strlen(names) + 1;
|
|
|
|
parts[i].name = names;
|
|
plen -= len;
|
|
names += len;
|
|
} else {
|
|
parts[i].name = "unnamed";
|
|
}
|
|
|
|
part++;
|
|
}
|
|
|
|
*pparts = parts;
|
|
return nr_parts;
|
|
}
|
|
|
|
static struct mtd_part_parser ofoldpart_parser = {
|
|
.parse_fn = parse_ofoldpart_partitions,
|
|
.name = "ofoldpart",
|
|
};
|
|
|
|
static int __init ofpart_parser_init(void)
|
|
{
|
|
register_mtd_parser(&ofpart_parser);
|
|
register_mtd_parser(&ofoldpart_parser);
|
|
return 0;
|
|
}
|
|
|
|
static void __exit ofpart_parser_exit(void)
|
|
{
|
|
deregister_mtd_parser(&ofpart_parser);
|
|
deregister_mtd_parser(&ofoldpart_parser);
|
|
}
|
|
|
|
module_init(ofpart_parser_init);
|
|
module_exit(ofpart_parser_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("Parser for MTD partitioning information in device tree");
|
|
MODULE_AUTHOR("Vitaly Wool, David Gibson");
|
|
/*
|
|
* When MTD core cannot find the requested parser, it tries to load the module
|
|
* with the same name. Since we provide the ofoldpart parser, we should have
|
|
* the corresponding alias.
|
|
*/
|
|
MODULE_ALIAS("fixed-partitions");
|
|
MODULE_ALIAS("ofoldpart");
|