#! /bin/sh
-# deblob-check version 2008-07-22
+# deblob-check version 2008-08-04
# Inspired in gNewSense's find-firmware script.
# Written by Alexandre Oliva <lxoliva@fsfla.org>
# Specifies the number of consecutive integral or
# character constants that trigger the blob detector.
+# --reverse-patch: Test the removed parts of a patch, rather than
+# the added ones.
+
# The default sensitivity is 32 constants.
# The sensitivity, if present, must be the first option. The action
;;
esac
+reverse_patch=false
+case $1 in
+--reverse-patch)
+ reverse_patch=:
+ shift;
+ ;;
+esac
+
test_mode=false
name=deblob-check
addx "$1[^;]*;\\?" $2
}
+ # Same as initnc, but require the terminating semicolon.
+ defsnc () {
+ addx "$1[^;]*;" $2
+ }
+
# Look for a multi-line definition starting with a line that matches
# $1 (implicitly anchored to the beginning of the line), and ending
# at the first ';' that's not within comments.
# sensitivity, so make sure the sequences of numbers that are not
# blobs are not deblobbed. FIXME: we should have patterns to
# recognize the blobs instead.
- accept " static const u32 test_pat\[4\]\[6\] = {$sepx$blobpat*$sepx};" drivers/net/tg3.c
+ defsnc ' static const u32 test_pat\[4\]\[6\] =' drivers/net/tg3.c
accept " }\\(,\\? mem_tbl_5\\(70x\\|705\\|755\\|906\\)\\[\\] = {$sepx$blobpat*$sepx}\\)*;" drivers/net/tg3.c
;;
*/*linux*.tar* | */*kernel*.tar* | */*linux-*.*.*/*)
# checked:
accept ' \$3 = {{pge = {{ste = {\(\([0-9][0-9a-fx{},\n ]*\|\(pge\|ste\) =\|<repeats [0-9]\+ times>\)[{},\n ]*\)*<repeats 11 times>}'"$eol"
- # arch/sparc/lib/divdi3.S
- accept '__clz_tab:[\n] \.byte 0\(,[0-5]\)\+'"$sepx$blobpat*"
- accept 'PITBL:[\n] \.long 0xC0040000,0xC90FDAA2,'"$blobpat*"
- # arch/m68k/mac/mac_penguin.S
- accept '\(0x[0F][0F],\)\+\\[\n]\(\(0x[0F][0F],\)\+\\[\n]\)*\(0x[0F][0F],\)\+0x00'
- # arch/s390/kernel/head.S
- accept '\.lowcase:[\n] \.byte 0x00\(,0x0[1-7]\)\+'"$sepx$blobpat*$eol"
- # arch/s390/kernel/bitmap.S
- accept '_zb_findmap:[\n] \.byte 0\(,[123],0\)\+,4'"$sepx$blobpat*$eol"
- accept '_sb_findmap:[\n] \.byte 8\(,0,[123]\)\+,0'"$sepx$blobpat*$eol"
- # arch/powerpc/lib/copyuser_64.S
- accept ' \.section __ex_table,"a"'"$sepx$blobpat*"
- # arch/powerpc/platforms/iseries/mf.c
- accept ' memcpy(src, "\\x01\\x00\\x00\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00".*PROGxxxx'
- # arch/ppc/platforms/ev64260.c
- initnc 'static const unsigned int cpu_745x\[2\]\[16\] ='
- # arch/alpha/lib/fls.c
- initnc 'const unsigned char __flsm1_tab\[256\] ='
- # drivers/input/misc/map_to_7segment.h
- accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n] \(0,\)\+'"$eol"
- # sound/oss/ad1848.c
- initc ' static int init_values_b\[\] ='
- # drivers/input/keyboard/atkbd.c
- initnc 'static unsigned char atkbd_set2_keycode\[512\] ='
- # drivers/usb/serial/keyspan_pda.S and
- # drivers/usb/serial/xircom_pgs.S
- accept 'desc_config1:[\n] \.byte 0x09, 0x02'"$sepx$blobpat*"
- accept 'string_mfg:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_mfg_end:'
- accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:'
- # drivers/media/video/pwc/pwc-nala.h
- accept ' [/][*] \(SQCIF\|QSIF\|QCIF\|SIF\|CIF\|VGA\) [*][/][\n] {[\n] {'"$blobpat*"
- # drivers/video/logo/*.ppm
- accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+'
- # Documentation/specialix.txt
- accept 'for i in [ 0-9\\\n]*[\n]do'
- # Documentation/cpu-freq/cpufreq-stats.txt
- accept ' : 3600000 3400000 3200000 3000000 2800000 '
- # Documentation/scsi/sym53c8xx_2.txt and
- # Documentation/scsi/ncr53c8xx_2.txt
- accept '00 00[\n]64 01[\n]8e 0b[\n][\n][0-9a-f \n]*fe fe'
- accept '0f 00 08 08 64 00 0a 00 - id 0[\n]'"$blobpat*"
- accept 'default nvram data:'"$sepx$blobpat*"
- # Documentation/video4linux/sn9c102.txt
- accept '0x0458 0x7025[\n]'"$blobpat*"
- # Documentation/video4linux/et61x251.txt
- accept '0x102c 0x6151[\n]'"$blobpat*"
- # Documentation/video4linux/zc0301.txt
- accept '0x041e 0x4017[\n]'"$blobpat*"
- # Documentation/uml/UserModeLinux-HOWTO.txt
- accept ' (gdb) x\/100x \$25[\n] 0x507d2434: 0x507d2434 0x00000000 0x08048000 0x080a4f8c'"$sepx$blobpat*"
- # Documentation/isdn/README.inc
- accept ' 1 0 0 0 0x308'"$sepx$blobpat*"
- # Documentation/sched-stats.txt
- accept 'domain<N> <cpumask> 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36'"$eol"
- # net/ipv4/ipvs/ip_vs_sync.c and
- # net/sctp/sm_make_chunk.c and
- # include/linux/sctp.h
- accept '[ * ]*0 1 2 3[\n][ * ]*0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1'
- # arch/x86/lguest/boot.c
- accept ' \* 1 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0'
- # drivers/net/fealnx.c
- ocomment ' [/][*] Configure the PCI bus bursts and FIFO thresholds.'
- # drivers/hwmon/via686a.c
- ocomment '[/][*] the original LUT values from Alex van Kaam <darkside@chello\.nl>'
- # drivers/media/video/saa7114.c
- initc 'static const unsigned char init\[\] = {[^;]*MODE=0 ;.*SAA_7114_NTSC_HSYNC_START'
+ accept '__clz_tab:[\n] \.byte 0\(,[0-5]\)\+'"$sepx$blobpat*" arch/sparc/lib/divdi3.S
+ accept 'PITBL:[\n] \.long 0xC0040000,0xC90FDAA2,'"$blobpat*" arch/sparc/lib/divdi3.S
+ accept '\(0x[0F][0F],\)\+\\[\n]\(\(0x[0F][0F],\)\+\\[\n]\)*\(0x[0F][0F],\)\+0x00' arch/m68k/mac/mac_penguin.S
+ accept '\.lowcase:[\n] \.byte 0x00\(,0x0[1-7]\)\+'"$sepx$blobpat*$eol" arch/s390/kernel/head.S
+ accept '_zb_findmap:[\n] \.byte 0\(,[123],0\)\+,4'"$sepx$blobpat*$eol" arch/s390/kernel/bitmap.S
+ accept '_sb_findmap:[\n] \.byte 8\(,0,[123]\)\+,0'"$sepx$blobpat*$eol" arch/s390/kernel/bitmap.S
+ accept ' \.section __ex_table,"a"'"$sepx$blobpat*" arch/powerpc/lib/copyuser_64.S
+ accept ' memcpy(src, "\\x01\\x00\\x00\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00".*PROGxxxx' arch/powerpc/platforms/iseries/mf.c
+ initnc 'static const unsigned int cpu_745x\[2\]\[16\] =' arch/ppc/platforms/ev64260.c
+ initnc 'const unsigned char __flsm1_tab\[256\] =' arch/alpha/lib/fls.c
+ accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n] \(0,\)\+'"$eol" drivers/input/misc/map_to_7segment.h
+ initc ' static int init_values_b\[\] =' sound/oss/ad1848.c
+ initnc 'static unsigned char atkbd_set2_keycode\[512\] =' drivers/input/keyboard/atkbd.c
+ accept 'desc_config1:[\n] \.byte 0x09, 0x02'"$sepx$blobpat*" 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S'
+ accept 'string_mfg:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_mfg_end:' 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S'
+ accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:' 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S'
+ accept ' [/][*] \(SQCIF\|QSIF\|QCIF\|SIF\|CIF\|VGA\) [*][/][\n] {[\n] {'"$blobpat*" drivers/media/video/pwc/pwc-nala.h
+ accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' drivers/video/logo/*.ppm
+ accept 'for i in [ 0-9\\\n]*[\n]do' Documentation/specialix.txt
+ accept ' : 3600000 3400000 3200000 3000000 2800000 ' Documentation/cpu-freq/cpufreq-stats.txt
+ accept '00 00[\n]64 01[\n]8e 0b[\n][\n][0-9a-f \n]*fe fe' 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt'
+ accept '0f 00 08 08 64 00 0a 00 - id 0[\n]'"$blobpat*" 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt'
+ accept 'default nvram data:'"$sepx$blobpat*" 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt'
+ accept '0x0458 0x7025[\n]'"$blobpat*" Documentation/video4linux/sn9c102.txt
+ accept '0x102c 0x6151[\n]'"$blobpat*" Documentation/video4linux/et61x251.txt
+ accept '0x041e 0x4017[\n]'"$blobpat*" Documentation/video4linux/zc0301.txt
+ accept ' (gdb) x\/100x \$25[\n] 0x507d2434: 0x507d2434 0x00000000 0x08048000 0x080a4f8c'"$sepx$blobpat*" Documentation/uml/UserModeLinux-HOWTO.txt
+ accept ' 1 0 0 0 0x308'"$sepx$blobpat*" Documentation/isdn/README.inc
+ accept 'domain<N> <cpumask> 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36'"$eol" Documentation/sched-stats.txt
+ accept '[ * ]*0 1 2 3[\n][ * ]*0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1' 'net/ipv4/ipvs/ip_vs_sync.c|net/sctp/sm_make_chunk.c|include/linux/scpt.h'
+ accept ' \* 1 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0' arch/x86/lguest/boot.c
+ ocomment ' [/][*] Configure the PCI bus bursts and FIFO thresholds.' drivers/net/fealnx.c
+ ocomment '[/][*] the original LUT values from Alex van Kaam <darkside@chello\.nl>' drivers/hwmon/via686a.c
+ initc 'static const unsigned char init\[\] = {[^;]*MODE=0 ;.*SAA_7114_NTSC_HSYNC_START' drivers/media/video/saa7114.c
# in 2.6.23 only
accept " Psize Ipps Tput Rxint Txint Done Ndone[\\n] ---------------------------------------------------------------\\([\\n][ 0-9]\\+\\)\\+$eol"
initnc 'static short dmasound_[au]law2dma16\[\] ='
initnc 'static const unsigned short DACVolTable\[101\] ='
+ # in 2.6.22
+ initnc 'static const UQItype __clz_tab\[\] =' arch/arm26/lib/udivdi3.c
+ initnc ' static unsigned char scale\[101\] =' sound/oss/opl3sa2.c
+ initnc '} syncs\[\] =' drivers/scsi/53c7xx.c
+ initnc 'genoa_md:'"$sepx$blobpat*"'[\n] \.ascii "Genoa"' arch/i386/boot/video.S
+
+ # in 2.6.21
+ initnc 'Vendor ID Product ID[\n]-\+ -\+[\n]'"$blobpat*" Documentation/video4linux/sn9c102.txt
+ defsnc 'static short [au]law2dma16\[\]' arch/ppc/8xx_io/cs4218_tdm.c
+ defsnc ' static const char minimal_ascii_table\[\]' drivers/ieee1394/csr1212.c
+ defsnc 'static u16 key_map \[256\] =' drivers/media/dvb/ttpci/av7110_ir.c
+ defsnc 'static unsigned char gf64_inv\[64\] =' drivers/mtd/nand/cafe_ecc.c
+ defsnc 'static unsigned short err_pos_lut\[4096\] =' drivers/mtd/nand/cafe_ecc.c
+ defsnc 'static unsigned char testdata\[TESTDATA_LEN\] =' fs/jffs2/comprtest.c
+
# new in 2.6.25
accept "%canned_values = ([\\n] \\([0-9]\\+ => \\[[ \\n]\\+\\(\\([0-9]\\+\\|'0x[0-9a-f]\\+'\\),[ \\n]*\\)*\\]\\(, \\|[\\n]\\)\\)*);"
# These are regarded as ok
initnc 'static const u8 SN9C102_\(Y\|UV\)_QTABLE[01]\[64\] = {'
- initnc ' static const u8 jpeg_header\[589\] = {'
+ initnc ' static \(const \)\?u8 jpeg_header\[589\] = {' media/video/sn9c102/sn9c102_core.c
accept '[ ]\{1,2\}err = sn9c102_write_const_regs(cam\(,[ \n]\+{0x[0-9a-fA-F][0-9a-fA-F], 0x[0-9a-fA-F][0-9a-fA-F]}\)*);'
# too lax?
initnc ' static unsigned char CRCTable2\[\] ='
initnc ' static unsigned char default_colors\[\] ='
initnc ' static unsigned char iso_regs\[8\]\[4\] ='
- initnc ' static unsigned char log_scale\[101\] ='
+ initnc ' static unsigned char log_scale\[101\] =' sound/oss/pss.c
initnc ' static unsigned char msg\[\] ='
initnc ' static unsigned char static_pad\[\] ='
initnc ' static unsigned char table_alaw2ulaw\[\] ='
initnc 'static __u8 init7121ntsc\[\] ='
initnc 'static __u8 init7121pal\[\] ='
initnc 'static byte capidtmf_leading_zeroes_table\[0x100\] ='
- initnc 'static char channel_map_madi_ss\[HDSPM_MAX_CHANNELS\] ='
+ defsnc 'static char channel_map_madi_[sdq]s\[HDSPM_MAX_CHANNELS\] =' sound/pci/rme9652/hdspm.c
initnc 'static char coefficients\[NM_TOTAL_COEFF_COUNT \* 4\] ='
initnc 'static char ecc_syndrome_table\[\] ='
initnc 'static char isdn_audio_alaw_to_ulaw\[\] ='
initnc 'static const unsigned short wd7000_iobase\[\] ='
initnc 'static const unsigned short x86_keycodes\[256\] ='
initnc 'static const unsigned table\[\] ='
- initnc 'static int MV300_reg_8bit\[256\] ='
+ initnc 'static int MV300_reg_8bit\[256\] \?=' drivers/video/atafb.c
initnc 'static int fifo_map\[\]\[MAX_TX_FIFOS\] ='
initnc 'static int initial_lfsr\[\] ='
initnc 'static int log_tbl\[129\] ='
initnc 'static int reserve_list\[MAX_RES_ARGS\] ='
initnc 'static int reverse6\[64\] ='
initnc 'static short attack_time_tbl\[128\] ='
- initnc 'static short beep_wform\[256\] ='
+ defsnc 'static short beep_wform\[256\] =' 'sound/ppc/beep.c|sound/oss/dmasound/dmasound_awacs.c|arch/ppc/8xx_io/cs4218_tdm.c'
initnc 'static short decay_time_tbl\[128\] ='
initnc 'static short isdn_audio_[ua]law_to_s16\[\] ='
initnc 'static struct cipher_testvec anubis_cbc_dec_tv_template\[\] ='
initnc 'static unsigned char a2232_65EC02code\[\] ='
initnc 'static unsigned char atkbd_set3_keycode\[512\] ='
initnc 'static unsigned char atkbd_unxlate_table\[128\] ='
- initnc 'static unsigned char banner_table\[\] ='
+ initnc 'static unsigned char banner_table\[\] =' arch/sh/boards/superh/microdev/led.c
initnc 'static unsigned char bootlogo_bits\[\] ='
initnc 'static unsigned char bus2core_8260\[\] ='
initnc 'static unsigned char bus2core_8280\[\] ='
*/patch*2.6.27-rc* | */patch*2.6.26-git* | */git-linus.diff)
accept ' \.section __ex_table,"a"'"$sepx$blobpat*" 'arch/x86/lib/copy_user_\(nocache_\)\?64.S'
initnc 'static struct cipher_testvec des3_ede_cbc_\(enc\|dec\)_tv_template\[\] =' crypto/tcrypt.h
-
accept 'desc_config1:[\n] \.byte 0x09, 0x02'"$sepx$blobpat*" 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S'
accept 'string_mfg:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_mfg_end:' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S'
accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S'
initnc 'static const unsigned short atkbd_set[23]_keycode\[512\] =' drivers/input/keyboard/atkbd.c
initnc 'static const unsigned short atkbd_unxlate_table\[128\] =' drivers/input/keyboard/atkbd.c
+ initnc 'static const unsigned char usb_kbd_keycode\[256\] =' drivers/hid/usbhid/usbkbd.c
initnc ' u8 buf, bufs\[\] =' drivers/media/dvb/dvb-usb/cxusb.c
initnc 'static struct dvb_pll_desc [^\n]* =' drivers/media/dvb/frontends/dvb-pll.c
initnc ' static int sysdiv_to_div_x_2\[\] =' arch/powerpc/platforms/512x/clock.c
initnc 'static const u8 rtl8225z2_tx_power_cck\[\] =' drivers/net/wireless/rtl8187_rtl8225.c
initnc 'static const u8 rtl8225z2_tx_power_cck_ch14\[\] =' drivers/net/wireless/rtl8187_rtl8225.c
initnc 'static const __u16 t10_dif_crc_table\[256\] =' lib/crc-t10dif.c
+ initnc 'static crb_128M_2M_block_map_t crb_128M_2M_map\[64\] =' drivers/net/netxen/netxen_hw.c
+ initnc 'static const __u16 crc10_table\[256\] =' drivers/usb/serial/safe_serial.c
+ accept '[ ]*\( *0\)*\( *1\)*[\n][ ]*0 1 2 3 4 5 6 7 8 9 0 1 *2 3 4 5 6 7' 'Documentation/bt8xxgpio.txt'
+ initnc ' static int exp_lut\[256\] =' drivers/isdn/mISDN/dsp_audio.c
+ initnc 'static const u32 bf_pbox\[16 \+ 2\] =' drivers/isdn/mISDN/dsp_blowfish.c
+ initnc 'static const u32 bf_sbox\[256 \* 4\] =' drivers/isdn/mISDN/dsp_blowfish.c
+ initnc 'static u8 sample_\(german_\(all\|old\)\|american_\(dialtone\|ringing\|busy\)\|special[123]\|silence\)\[\] =' drivers/isdn/mISDN/dsp_tones.c
+ initnc 'struct pattern {[^}]*int tone;[^}]*} pattern\[\] =' drivers/isdn/mISDN/dsp_tones.c
+ initnc 'static u8 \([au]\|_4\)law_to_\([ua]law\|4bit\)\[256\] =' drivers/isdn/mISDN/l1oip_codec.c
+ initnc 'static unsigned char banner_table\[\] =' arch/sh/boards/mach-microdev/led.c
+ initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const \(yytype_u\?int\(8\|16\)\|\(unsigned \)\?\(short\( int\)\?\|char\)\) yy[^[]*\[\] =[*][/];' scripts/genksyms/parse.c_shipped
+
;;
+ */drm-modesetting-radeon.patch)
+ initnc 'static int atom_dst_to_src\[8\]\[4\] =' drivers/gpu/drm/radeon/atom.c
+ ;;
+
*/patch*2.6.26-rc*)
initnc 'static u64 vec2off\[68\] =' arch/ia64/kvm/process.c
initnc " interrupts = <\\(0x\\)\\?3 \\(0x\\)\\?0 \\(0x\\)\\?0 $blobpat*>;" 'arch/powerpc/boot/dts/\(cm5200\|lite5200b\?\|kuroboxHG\|pcm030\|tqm5200\).dts'
cmd="tar -xf - --to-command='echo \";/*begin \$TAR_FILENAME*/;\"; cat; echo \";/**/;\"; echo \";/*end \$TAR_FILENAME*/;\"'"
;;
*.patch | */patch-* | *.diff)
- sedpatch='
- /^[-]/d;
- /^\(@@\|+++\) / {
- i\
-;/**/;\
-;/*end patchlet */;\
+ if $reverse_patch; then
+ s=- r=+
+ else
+ s=+ r=-
+ fi
+ sedpatch="
+ /^[$r]/d;
+ /^\\(@@\\|$s$s$s\\) / {
+ i\\
+;/**/;\\
+;/*end patchlet */;\\
;/*begin patchlet */;
- s/^/;\/*/;
- s/$/*\/;/;
+ s/^/;\\/*/;
+ s/\$/*\\/;/;
};
- s/^[ +]//;'
+ s/^[ $s]//;"
cmd='sed "$sedpatch"'
;;
*)