X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-check;h=6028e78fe1313db0c4dd099f36c495ca26774247;hb=4334022df38cbf71c96fe45655092211b5207dd6;hp=0114d395826b385a1eec7b532fa1d4d7660ca8a3;hpb=c894cca602b4871b59658bf3ebbcb827049d5379;p=releases.git diff --git a/deblob-check b/deblob-check index 0114d395826b..6028e78fe131 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2008-05-18 +# deblob-check version 2008-07-22 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -26,7 +26,7 @@ # usage: deblob-check [-S] [-vv] [-s S] [-lDdBbCcXxPpFftVh?H] \ -# [*.tar* patch-* *.patch] +# [*.tar* patch-* *.patch *.diff] # Look for too-long undocumented sequences of numbers (generally blobs # in disguise) in source files. @@ -38,6 +38,9 @@ # 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 @@ -250,6 +253,14 @@ case $1 in ;; esac +reverse_patch=false +case $1 in +--reverse-patch) + reverse_patch=: + shift; + ;; +esac + test_mode=false name=deblob-check @@ -515,8 +526,8 @@ set_except () { # 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. - initnc ' static const u32 test_pat\[4\]\[6\] =' - initnc ' }, mem_tbl_5705\[\] =' + accept " static const u32 test_pat\[4\]\[6\] = {$sepx$blobpat*$sepx};" drivers/net/tg3.c + accept " }\\(,\\? mem_tbl_5\\(70x\\|705\\|755\\|906\\)\\[\\] = {$sepx$blobpat*$sepx}\\)*;" drivers/net/tg3.c ;; */*linux*.tar* | */*kernel*.tar* | */*linux-*.*.*/*) # false alarms, contain source @@ -647,6 +658,23 @@ set_except () { initnc 'static const struct ath5k_ini_rf rfregs_5413\[\] =' initnc 'const u\(8\|16\|32\) b43_ntab_\(\(adjustpower\|estimatepowerlt\|gainctl\|iqlt\|loftlt\|noisevar1\|tdi[24]0a\)[01]\|channelest\|frame\(lookup\|struct\)\|mcs\|pilot\|tdtrn\|tmap\)\[\] =' + # new in 2.6.26 + 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' + initnc 'static const u32 crctab32\[\] =' arch/x86/boot/tools/build.c + initnc 'static struct mse2snr_tab \(vsb\|qam\(64\|256\)\)_mse2snr_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} \(VSB\|QAM\)_mod_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} itd1000_\(lpf_pga\|fre_values\)\[\] =' drivers/media/dvb/frontends/itd1000.c + initnc '} \(vsb\|qam\(64\|256\)\)_snr_tab\[\] =' drivers/media/dvb/frontends/s5h1411.c + initnc '} snr_tab\[\] =' drivers/media/dvb/frontends/tda10048.c + initnc 'static u32 reg_init_initialize\[\] =' drivers/media/video/saa717x.c + initnc 'static const u32 \(main\|gear\)_seedset\[BACKOFF_SEEDSET_ROWS\]\[BACKOFF_SEEDSET_LFSRS\] =' drivers/net/forcedeth.c + initnc 'static const struct ath5k_ini_mode rf24\(13\|25\)_ini_mode_end\[\] =' drivers/net/wireless/ath5k/initvals.c + initnc 'static const u16 wm9713_reg\[\] =' sound/soc/codecs/wm9713.c + + # This looks suspicious, but it pretty much just sets stuff to zero. + initnc 'static __u8 mode8420\(pro\|con\)\[\] =' drivers/media/video/cs8420.h + # quite suspicious # arch/parisc/kernel/perf_images.h initc 'static uint32_t onyx_images\[\]\[PCXU_IMAGE_SIZE\/sizeof(uint32_t)\] __read_mostly =' @@ -692,7 +720,7 @@ set_except () { initnc ' #define WakeupSeq {' initnc ' SetRate44100\[\] =' initnc ' const short period\[32\] =' - initnc ' const static int desc_idx_table\[\] =' + initnc ' \(const static\|static const\) int desc_idx_table\[\] =' initnc ' int prop_bcomm_irq\[3\*16\] =' initnc ' static char logSlopeTable\[128\] =' initnc ' static const int uc_\(dup\|word\)_table\[\]\[2\] =' @@ -762,7 +790,6 @@ set_except () { initnc 'static __const__ __u16 gx_coeff\[256\] =' initnc 'static __u8 init7121ntsc\[\] =' initnc 'static __u8 init7121pal\[\] =' - initnc 'static __u8 mode8420\(pro\|con\)\[\] =' initnc 'static byte capidtmf_leading_zeroes_table\[0x100\] =' initnc 'static char channel_map_madi_ss\[HDSPM_MAX_CHANNELS\] =' initnc 'static char coefficients\[NM_TOTAL_COEFF_COUNT \* 4\] =' @@ -983,11 +1010,10 @@ set_except () { initnc 'static uchar sbox\[8\]\[4\]\[16\] =' initnc 'static uint16_t crc_table\[256\] =' initnc 'static uint8_t lpfcAlpaArray\[\] =' - initnc 'static uint8_t seqprog\[\] =' + initnc 'static \(const \)\?uint8_t seqprog\[\] =' initnc 'static unsigned char V110_OffMatrix_9600\[\] =' initnc 'static unsigned char V110_OnMatrix_9600\[\] =' initnc 'static unsigned char a2232_65EC02code\[\] =' - initnc 'static unsigned char alaw_main\[\] =' initnc 'static unsigned char atkbd_set3_keycode\[512\] =' initnc 'static unsigned char atkbd_unxlate_table\[128\] =' initnc 'static unsigned char banner_table\[\] =' @@ -1000,11 +1026,7 @@ set_except () { initnc 'static unsigned char expressiontab\[128\] =' initnc 'static unsigned char header2\[\] =' initnc 'static unsigned char hidp_keycode\[256\] =' - initnc 'static unsigned char ima_adpcm_capture\[\] =' - initnc 'static unsigned char ima_adpcm_init\[\] =' - initnc 'static unsigned char ima_adpcm_playback\[\] =' initnc 'static unsigned char irq_xlate\[32\] =' - initnc 'static unsigned char mulaw_main\[\] =' initnc 'static unsigned char nkbd_keycode\[128\] =' initnc 'static unsigned char pan_volumes\[256\] =' initnc 'static unsigned char parm_block\[32\] =' @@ -1080,6 +1102,57 @@ set_except () { initnc '} vsb_snr_tab\[\] =' initnc '} yss225_registers\[\] __devinitdata =' ;; + + */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' + accept ':03000000020200F9[\n]:040023000205\(9B0037\|5F0073\)[\n]\(:050030000000000000CB[\n]\|:0400430002010000B6[\n]\)*'"$sepx$blobpat*"'[\n]:\(0E06E0006400670065007400060334003700F4\|0606A000060334003700E0\)[\n]:00000001FF[\n]' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).HEX' + accept ':100000000C004000000000000000000000000000A4[\n]'"$sepx$blobpat*"'[\n]\/\* DSP56001 bootstrap code \*\/' firmware/dsp56k/bootstrap.bin.ihex + initnc 'static const u16 uda1380_reg\[UDA1380_CACHEREGNUM\] =' sound/soc/codecs/uda1380.c + initnc 'static const u16 wm8510_reg\[WM8510_CACHEREGNUM\] =' sound/soc/codecs/wm8510.c + + 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 ' 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 cx_inits_\(176\|320\|352\|640\)\[\] =' drivers/media/video/gspca/conex.c + initnc 'static const __u8 cx_jpeg_init\[\]\[8\] =' drivers/media/video/gspca/conex.c + initnc 'static const __u8 cxjpeg_\(640\|352\|320\|176\|qtable\)\[\]\[8\] =' drivers/media/video/gspca/conex.c + initnc 'static const unsigned char quant\[\]\[0x88\] =' drivers/media/video/gspca/jpeg.h + initnc 'static unsigned char huffman\[\] =' drivers/media/video/gspca/jpeg.h + initc ' static const struct ov_i2c_regvals norm_76[1247]0\[\] =' drivers/media/video/gspca/ov519.c + initnc 'static const __u8 pac207_sensor_init\[\]\[8\] =' drivers/media/video/gspca/pac207.c + initnc 'static const __u8 pac7311_jpeg_header\[\] =' drivers/media/video/gspca/pac7311.c + initnc 'static const __u8 init\(Hv7131\|Ov\(6650\|7630\(_3\)\?\)\|Pas\(106\|202\)\|Tas51[13]0\)\[\] =' drivers/media/video/gspca/sonixb.c + initnc 'static const __u8 \(hv7131\|ov\(6650\|7630\(_3\)\?\)\|pas\(106\|202\)\|tas51[13]0\)_sensor_init\(_com\)\?\[\]\[8\] =' drivers/media/video/gspca/sonixb.c + initnc 'static const __u8 \(hv7131r\|mi0360\|mo4000\|ov76\(60\|48\)\)_sensor_init\[\]\[8\] =' drivers/media/video/gspca/sonixj.c + initnc 'static const __u8 qtable4\[\] =' drivers/media/video/gspca/sonixj.c + initnc 'static const __u16 \(spca500_visual\|Clicksmart510\)_defaults\[\]\[3\] =' drivers/media/video/gspca/spca500.c + initnc 'static const __u8 qtable_\(creative_pccam\|kodak_ez200\|pocketdv\)\[2\]\[64\] =' drivers/media/video/gspca/spca500.c + initnc 'static const __u16 spca501c\?_\(\(3com\|arowana\|mysterious\)_\)\?\(init\|open\)_data\[\]\[3\] =' drivers/media/video/gspca/spca501.c + initnc 'static const __u16 spca505b\?_\(init\|open\)_data\(_ccd\)\?\[\]\[3\] =' drivers/media/video/gspca/spca505.c + initnc 'static const __u16 spca508\(cs110\|_sightcam2\?\|_vista\)\?_init_data\[\]\[3\] =' drivers/media/video/gspca/spca508.c + initnc 'static const __u16 spca561_init_data\[\]\[2\] =' drivers/media/video/gspca/spca561.c + initnc 'static const __u16 spca504\(_pccam600\|A_clicksmart420\)_\(init\|open\)_data\[\]\[3\] =' drivers/media/video/gspca/sunplus.c + initnc 'static const __u8 qtable_\(creative_pccam\|spca504_default\)\[2\]\[64\] =' drivers/media/video/gspca/sunplus.c + initnc 'static const __u8 \(effects\|gamma\)_table\[MAX_[A-Z]*\]\[[0-9]*\] =' drivers/media/video/gspca/t631.c + initnc 'static const __u8 tas5130a_sensor_init\[\]\[8\] =' drivers/media/video/gspca/t613.c + initnc ' static const __u8 \(read_indexs\|n\(set\)\?[0-9]*\|missing\)\[[0-9x]*\] =' drivers/media/video/gspca/t613.c + initc 'static const __u8 \(mi13[12]0\|po3130\|hv7131r\|ov76[67]0\)_\(\(soc\)\?initQ\?VGA_\(JPG\|data\)\|rundata\)\[\]\[4\] =' drivers/media/video/gspca/vc032x.c + initnc 'static const struct usb_action \(cs2102\|hdcs2020xx\|icm105axx\|ov7630c\|pb0330[3x]x\)_Initial\(Scale\)\?\[\] =' drivers/media/video/gspca/zc3xx.c + initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_ofdm\[\] =' drivers/net/wireless/rtl8187_rtl8225.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 + ;; + */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' @@ -1111,7 +1184,7 @@ set_except () { initnc 'static u32 reg_init_initialize\[\] =' drivers/media/video/saa717x.c initnc ' } vals\[\] =' drivers/media/video/saa717x.c initnc 'static const u32 \(main\|gear\)_seedset\[BACKOFF_SEEDSET_ROWS\]\[BACKOFF_SEEDSET_LFSRS\] =' drivers/net/forcedeth.c - blob '^unsigned char \(IDX_ACTIVATE_\(READ\|WRITE\)\|\(CM\|ULP\)_\(ENABLE\|SETUP\)\|DM_ACT\) = '"$blobsep$blobseq*$blobsep;" drivers/s390/net/qeth_core_mpc.c # from drivers/s390/net/qeth_mpc.c in 2.6.25 + blob '^unsigned char \(IDX_ACTIVATE_\(READ\|WRITE\)\|\(CM\|ULP\)_\(ENABLE\|SETUP\)\|DM_ACT\) = '"$sepx$blobseq*$sepx;" drivers/s390/net/qeth_core_mpc.c # from drivers/s390/net/qeth_mpc.c in 2.6.25 initnc '} pll_table\[\] =' drivers/video/geode/lxfb_ops.c accept " { 0x00014284, 19688 },[\n] { 0x00011104, 20400 },[\n] { $blobpat* }," drivers/video/geode/lxfb_ops.c # won't be necessary in rc3 initnc 'static const u16 wm9713_reg\[\] =' sound/soc/codecs/wm9713.c @@ -1283,7 +1356,7 @@ defineblob='[ ]*#[ ]*define[ ]\+\([^\n]*\\[\n]\)*[^\n]*'"$blobseq"'\([^\n]*\\ # Regular expression that matches an assembly label followed by a blob # without any intervening label. -asmblob="[a-zA-Z_.][^\\n:;#/ ]*[ ]*:\\([^:]*\\|$asmcomment\\)*$blobseq\\([^:]*\\|$asmcomment\\)*" +asmblob="[a-zA-Z_.][^\\n:;#/ ]*[ ]*:\\([^:{}]*\\|$asmcomment\\)*$blobseq\\([^:]*\\|$asmcomment\\)*" # Regular expression that matches one or more blobs without # intervening line breaks. @@ -1863,22 +1936,27 @@ check () { fi # Extract or otherwise munge... - case $input in + case /$input in *.tar*) cmd="tar -xf - --to-command='echo \";/*begin \$TAR_FILENAME*/;\"; cat; echo \";/**/;\"; echo \";/*end \$TAR_FILENAME*/;\"'" ;; - *patch* | *diff*) - sedpatch=' - /^[-]/d; - /^\(@@\|+++\) / { - i\ -;/**/;\ -;/*end patchlet */;\ + *.patch | */patch-* | *.diff) + 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"' ;; *)