Skip to content

Commit 22c2ed6

Browse files
computersforpeaceakpm00
authored andcommitted
checkpatch: check for missing sentinels in ID arrays
All of the ID tables based on <linux/mod_devicetable.h> (of_device_id, pci_device_id, ...) require their arrays to end in an empty sentinel value. That's usually spelled with an empty initializer entry (e.g., "{}"), but also sometimes with explicit 0 entries, field initializers (e.g., '.id = ""'), or even a macro entry (like PCMCIA_DEVICE_NULL). Without a sentinel, device-matching code may read out of bounds. I've found a number of such bugs in driver reviews, and we even occasionally commit one to the tree. See commit 5751eee ("i2c: nomadik: Add missing sentinel to match table") for example. Teach checkpatch to find these ID tables, and complain if it looks like there wasn't a sentinel value. Test output: $ git format-patch -1 a0d15cc --stdout | scripts/checkpatch.pl - ERROR: missing sentinel in ID array torvalds#57: FILE: drivers/i2c/busses/i2c-nomadik.c:1073: +static const struct of_device_id nmk_i2c_eyeq_match_table[] = { { .compatible = "XXXXXXXXXXXXXXXXXX", .data = (void *)(NMK_I2C_EYEQ_FLAG_32B_BUS | NMK_I2C_EYEQ_FLAG_IS_EYEQ5), }, }; total: 1 errors, 0 warnings, 66 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. "[PATCH] i2c: nomadik: switch from of_device_is_compatible() to" has style problems, please review. NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. When run across the entire tree (scripts/checkpatch.pl -q --types MISSING_SENTINEL -f ...), false positives exist: * where macros are used that hide the table from analysis (e.g., drivers/gpu/drm/radeon/radeon_drv.c / radeon_PCI_IDS). There are fewer than 5 of these. * where such tables are processed correctly via ARRAY_SIZE() (fewer than 5 instances). This is by far not the typical usage of *_device_id arrays. * some odd parsing artifacts, where ctx_statement_block() seems to quit in the middle of a block due to #if/#else/#endif. Also, not every "struct *_device_id" is in fact a sentinel-requiring structure, but even with such types, false positives are very rare. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Brian Norris <[email protected]> Acked-by: Joe Perches <[email protected]> Cc: Andy Whitcroft <[email protected]> Cc: Brian Norris <[email protected]> Cc: Dwaipayan Ray <[email protected]> Cc: Lukas Bulwahn <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 1f04e0e commit 22c2ed6

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

scripts/checkpatch.pl

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,9 @@ sub hash_show_words {
685685
[\.\!:\s]*
686686
)};
687687

688+
# Device ID types like found in include/linux/mod_devicetable.h.
689+
our $dev_id_types = qr{\b[a-z]\w*_device_id\b};
690+
688691
sub edit_distance_min {
689692
my (@arr) = @_;
690693
my $len = scalar @arr;
@@ -7679,6 +7682,31 @@ sub process {
76797682
WARN("DUPLICATED_SYSCTL_CONST",
76807683
"duplicated sysctl range checking value '$1', consider using the shared one in include/linux/sysctl.h\n" . $herecurr);
76817684
}
7685+
7686+
# Check that *_device_id tables have sentinel entries.
7687+
if (defined $stat && $line =~ /struct\s+$dev_id_types\s+\w+\s*\[\s*\]\s*=\s*\{/) {
7688+
my $stripped = $stat;
7689+
7690+
# Strip diff line prefixes.
7691+
$stripped =~ s/(^|\n)./$1/g;
7692+
# Line continuations.
7693+
$stripped =~ s/\\\n/\n/g;
7694+
# Strip whitespace, empty strings, zeroes, and commas.
7695+
$stripped =~ s/""//g;
7696+
$stripped =~ s/0x0//g;
7697+
$stripped =~ s/[\s$;,0]//g;
7698+
# Strip field assignments.
7699+
$stripped =~ s/\.$Ident=//g;
7700+
7701+
if (!(substr($stripped, -4) eq "{}};" ||
7702+
substr($stripped, -6) eq "{{}}};" ||
7703+
$stripped =~ /ISAPNP_DEVICE_SINGLE_END}};$/ ||
7704+
$stripped =~ /ISAPNP_CARD_END}};$/ ||
7705+
$stripped =~ /NULL};$/ ||
7706+
$stripped =~ /PCMCIA_DEVICE_NULL};$/)) {
7707+
ERROR("MISSING_SENTINEL", "missing sentinel in ID array\n" . "$here\n$stat\n");
7708+
}
7709+
}
76827710
}
76837711

76847712
# If we have no input at all, then there is nothing to report on

0 commit comments

Comments
 (0)