mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
![Kees Cook](/assets/img/avatar_default.png)
The vzalloc() function has no 2-factor argument form, so multiplication factors need to be wrapped in array_size(). This patch replaces cases of: vzalloc(a * b) with: vzalloc(array_size(a, b)) as well as handling cases of: vzalloc(a * b * c) with: vzalloc(array3_size(a, b, c)) This does, however, attempt to ignore constant size factors like: vzalloc(4 * 1024) 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; @@ ( vzalloc( - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | vzalloc( - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression COUNT; typedef u8; typedef __u8; @@ ( vzalloc( - sizeof(u8) * (COUNT) + COUNT , ...) | vzalloc( - sizeof(__u8) * (COUNT) + COUNT , ...) | vzalloc( - sizeof(char) * (COUNT) + COUNT , ...) | vzalloc( - sizeof(unsigned char) * (COUNT) + COUNT , ...) | vzalloc( - sizeof(u8) * COUNT + COUNT , ...) | vzalloc( - sizeof(__u8) * COUNT + COUNT , ...) | vzalloc( - sizeof(char) * COUNT + COUNT , ...) | vzalloc( - 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; @@ ( vzalloc( - sizeof(TYPE) * (COUNT_ID) + array_size(COUNT_ID, sizeof(TYPE)) , ...) | vzalloc( - sizeof(TYPE) * COUNT_ID + array_size(COUNT_ID, sizeof(TYPE)) , ...) | vzalloc( - sizeof(TYPE) * (COUNT_CONST) + array_size(COUNT_CONST, sizeof(TYPE)) , ...) | vzalloc( - sizeof(TYPE) * COUNT_CONST + array_size(COUNT_CONST, sizeof(TYPE)) , ...) | vzalloc( - sizeof(THING) * (COUNT_ID) + array_size(COUNT_ID, sizeof(THING)) , ...) | vzalloc( - sizeof(THING) * COUNT_ID + array_size(COUNT_ID, sizeof(THING)) , ...) | vzalloc( - sizeof(THING) * (COUNT_CONST) + array_size(COUNT_CONST, sizeof(THING)) , ...) | vzalloc( - sizeof(THING) * COUNT_CONST + array_size(COUNT_CONST, sizeof(THING)) , ...) ) // 2-factor product, only identifiers. @@ identifier SIZE, COUNT; @@ vzalloc( - SIZE * COUNT + array_size(COUNT, SIZE) , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( vzalloc( - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | vzalloc( - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | vzalloc( - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | vzalloc( - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | vzalloc( - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | vzalloc( - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | vzalloc( - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | vzalloc( - 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; @@ ( vzalloc( - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | vzalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | vzalloc( - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | vzalloc( - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | vzalloc( - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | vzalloc( - 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; @@ ( vzalloc( - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | vzalloc( - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | vzalloc( - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | vzalloc( - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | vzalloc( - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | vzalloc( - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | vzalloc( - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | vzalloc( - 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; @@ ( vzalloc(C1 * C2 * C3, ...) | vzalloc( - E1 * E2 * E3 + array3_size(E1, E2, E3) , ...) ) // And then all remaining 2 factors products when they're not all constants. @@ expression E1, E2; constant C1, C2; @@ ( vzalloc(C1 * C2, ...) | vzalloc( - E1 * E2 + array_size(E1, E2) , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org>
198 lines
4.2 KiB
C
198 lines
4.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* fs/partitions/check.c
|
|
*
|
|
* Code extracted from drivers/block/genhd.c
|
|
* Copyright (C) 1991-1998 Linus Torvalds
|
|
* Re-organised Feb 1998 Russell King
|
|
*
|
|
* We now have independent partition support from the
|
|
* block drivers, which allows all the partition code to
|
|
* be grouped in one location, and it to be mostly self
|
|
* contained.
|
|
*
|
|
* Added needed MAJORS for new pairs, {hdi,hdj}, {hdk,hdl}
|
|
*/
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/genhd.h>
|
|
|
|
#include "check.h"
|
|
|
|
#include "acorn.h"
|
|
#include "amiga.h"
|
|
#include "atari.h"
|
|
#include "ldm.h"
|
|
#include "mac.h"
|
|
#include "msdos.h"
|
|
#include "osf.h"
|
|
#include "sgi.h"
|
|
#include "sun.h"
|
|
#include "ibm.h"
|
|
#include "ultrix.h"
|
|
#include "efi.h"
|
|
#include "karma.h"
|
|
#include "sysv68.h"
|
|
#include "cmdline.h"
|
|
|
|
int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/
|
|
|
|
static int (*check_part[])(struct parsed_partitions *) = {
|
|
/*
|
|
* Probe partition formats with tables at disk address 0
|
|
* that also have an ADFS boot block at 0xdc0.
|
|
*/
|
|
#ifdef CONFIG_ACORN_PARTITION_ICS
|
|
adfspart_check_ICS,
|
|
#endif
|
|
#ifdef CONFIG_ACORN_PARTITION_POWERTEC
|
|
adfspart_check_POWERTEC,
|
|
#endif
|
|
#ifdef CONFIG_ACORN_PARTITION_EESOX
|
|
adfspart_check_EESOX,
|
|
#endif
|
|
|
|
/*
|
|
* Now move on to formats that only have partition info at
|
|
* disk address 0xdc0. Since these may also have stale
|
|
* PC/BIOS partition tables, they need to come before
|
|
* the msdos entry.
|
|
*/
|
|
#ifdef CONFIG_ACORN_PARTITION_CUMANA
|
|
adfspart_check_CUMANA,
|
|
#endif
|
|
#ifdef CONFIG_ACORN_PARTITION_ADFS
|
|
adfspart_check_ADFS,
|
|
#endif
|
|
|
|
#ifdef CONFIG_CMDLINE_PARTITION
|
|
cmdline_partition,
|
|
#endif
|
|
#ifdef CONFIG_EFI_PARTITION
|
|
efi_partition, /* this must come before msdos */
|
|
#endif
|
|
#ifdef CONFIG_SGI_PARTITION
|
|
sgi_partition,
|
|
#endif
|
|
#ifdef CONFIG_LDM_PARTITION
|
|
ldm_partition, /* this must come before msdos */
|
|
#endif
|
|
#ifdef CONFIG_MSDOS_PARTITION
|
|
msdos_partition,
|
|
#endif
|
|
#ifdef CONFIG_OSF_PARTITION
|
|
osf_partition,
|
|
#endif
|
|
#ifdef CONFIG_SUN_PARTITION
|
|
sun_partition,
|
|
#endif
|
|
#ifdef CONFIG_AMIGA_PARTITION
|
|
amiga_partition,
|
|
#endif
|
|
#ifdef CONFIG_ATARI_PARTITION
|
|
atari_partition,
|
|
#endif
|
|
#ifdef CONFIG_MAC_PARTITION
|
|
mac_partition,
|
|
#endif
|
|
#ifdef CONFIG_ULTRIX_PARTITION
|
|
ultrix_partition,
|
|
#endif
|
|
#ifdef CONFIG_IBM_PARTITION
|
|
ibm_partition,
|
|
#endif
|
|
#ifdef CONFIG_KARMA_PARTITION
|
|
karma_partition,
|
|
#endif
|
|
#ifdef CONFIG_SYSV68_PARTITION
|
|
sysv68_partition,
|
|
#endif
|
|
NULL
|
|
};
|
|
|
|
static struct parsed_partitions *allocate_partitions(struct gendisk *hd)
|
|
{
|
|
struct parsed_partitions *state;
|
|
int nr;
|
|
|
|
state = kzalloc(sizeof(*state), GFP_KERNEL);
|
|
if (!state)
|
|
return NULL;
|
|
|
|
nr = disk_max_parts(hd);
|
|
state->parts = vzalloc(array_size(nr, sizeof(state->parts[0])));
|
|
if (!state->parts) {
|
|
kfree(state);
|
|
return NULL;
|
|
}
|
|
|
|
state->limit = nr;
|
|
|
|
return state;
|
|
}
|
|
|
|
void free_partitions(struct parsed_partitions *state)
|
|
{
|
|
vfree(state->parts);
|
|
kfree(state);
|
|
}
|
|
|
|
struct parsed_partitions *
|
|
check_partition(struct gendisk *hd, struct block_device *bdev)
|
|
{
|
|
struct parsed_partitions *state;
|
|
int i, res, err;
|
|
|
|
state = allocate_partitions(hd);
|
|
if (!state)
|
|
return NULL;
|
|
state->pp_buf = (char *)__get_free_page(GFP_KERNEL);
|
|
if (!state->pp_buf) {
|
|
free_partitions(state);
|
|
return NULL;
|
|
}
|
|
state->pp_buf[0] = '\0';
|
|
|
|
state->bdev = bdev;
|
|
disk_name(hd, 0, state->name);
|
|
snprintf(state->pp_buf, PAGE_SIZE, " %s:", state->name);
|
|
if (isdigit(state->name[strlen(state->name)-1]))
|
|
sprintf(state->name, "p");
|
|
|
|
i = res = err = 0;
|
|
while (!res && check_part[i]) {
|
|
memset(state->parts, 0, state->limit * sizeof(state->parts[0]));
|
|
res = check_part[i++](state);
|
|
if (res < 0) {
|
|
/* We have hit an I/O error which we don't report now.
|
|
* But record it, and let the others do their job.
|
|
*/
|
|
err = res;
|
|
res = 0;
|
|
}
|
|
|
|
}
|
|
if (res > 0) {
|
|
printk(KERN_INFO "%s", state->pp_buf);
|
|
|
|
free_page((unsigned long)state->pp_buf);
|
|
return state;
|
|
}
|
|
if (state->access_beyond_eod)
|
|
err = -ENOSPC;
|
|
if (err)
|
|
/* The partition is unrecognized. So report I/O errors if there were any */
|
|
res = err;
|
|
if (res) {
|
|
if (warn_no_part)
|
|
strlcat(state->pp_buf,
|
|
" unable to read partition table\n", PAGE_SIZE);
|
|
printk(KERN_INFO "%s", state->pp_buf);
|
|
}
|
|
|
|
free_page((unsigned long)state->pp_buf);
|
|
free_partitions(state);
|
|
return ERR_PTR(res);
|
|
}
|