diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh index c8a1d54..3ada94f 100755 --- a/spectre-meltdown-checker.sh +++ b/spectre-meltdown-checker.sh @@ -839,6 +839,8 @@ update_fwdb() { show_header + set -e + if [ -r "$mcedb_cache" ]; then previous_dbversion=$(awk '/^# %%% MCEDB / { print $4 }' "$mcedb_cache") fi @@ -891,7 +893,6 @@ update_fwdb() return 1 fi mcedb_revision=$(sqlite3 "$mcedb_tmp" "select revision from MCE") - mcedb_date=$(sqlite3 "$mcedb_tmp" "select strftime('%Y/%m/%d', date, 'unixepoch') from MCE") if [ -z "$mcedb_revision" ]; then echo ERROR "downloaded file seems invalid" return 1 @@ -899,7 +900,7 @@ update_fwdb() sqlite3 "$mcedb_tmp" "alter table Intel add column origin text" sqlite3 "$mcedb_tmp" "update Intel set origin='mce'" - echo OK "MCExtractor database revision $mcedb_revision dated $mcedb_date" + echo OK "MCExtractor database revision $mcedb_revision" # parse Intel firmwares to get their versions _info_nol "Integrating Intel firmwares data to db... " @@ -948,11 +949,7 @@ update_fwdb() fi echo DONE "(version $_intel_latest_date)" - dbdate=$(echo "$mcedb_date" | tr -d '/') - if [ "$dbdate" -lt "$_intel_latest_date" ]; then - dbdate="$_intel_latest_date" - fi - dbversion="$mcedb_revision.$dbdate+i$_intel_latest_date" + dbversion="$mcedb_revision+i$_intel_latest_date" if [ "$1" != builtin ] && [ -n "$previous_dbversion" ] && [ "$previous_dbversion" = "v$dbversion" ]; then echo "We already have this version locally, no update needed" @@ -5597,7 +5594,7 @@ exit 0 # ok # The builtin version follows, but the user can download an up-to-date copy (to be stored in his $HOME) by using --update-fwdb # To update the builtin version itself (by *modifying* this very file), use --update-builtin-fwdb -# %%% MCEDB v165.20201021+i20200616 +# %%% MCEDB v191+i20210217 # I,0x00000611,0x00000B27,19961218 # I,0x00000612,0x000000C6,19961210 # I,0x00000616,0x000000C6,19961210 @@ -5803,7 +5800,7 @@ exit 0 # ok # I,0x000306F1,0x00000014,20140110 # I,0x000306F2,0x00000044,20200527 # I,0x000306F3,0x0000000D,20160211 -# I,0x000306F4,0x00000016,20190617 +# I,0x000306F4,0x00000017,20201125 # I,0x00040650,0xFFFF000B,20121206 # I,0x00040651,0x00000026,20191112 # I,0x00040660,0xFFFF0011,20121012 @@ -5821,19 +5818,20 @@ exit 0 # ok # I,0x000406D8,0x0000012D,20190916 # I,0x000406E1,0x00000020,20141111 # I,0x000406E2,0x0000002C,20150521 -# I,0x000406E3,0x000000E2,20200714 +# I,0x000406E3,0x000000EA,20210125 # I,0x000406E8,0x00000026,20160414 # I,0x000406F0,0x00000014,20150702 -# I,0x000406F1,0x0B000038,20190618 +# I,0x000406F1,0x0B00003C,20201119 # I,0x00050650,0x8000002B,20160208 # I,0x00050651,0x8000002B,20160208 # I,0x00050652,0x80000037,20170502 # I,0x00050653,0x01000159,20200618 -# I,0x00050654,0x02006A08,20200616 +# I,0x00050654,0x02006B06,20210308 # I,0x00050655,0x03000012,20190412 -# I,0x00050656,0x04003003,20200618 -# I,0x00050657,0x05003003,20200618 -# I,0x0005065A,0x8600000D,20191108 +# I,0x00050656,0x04003006,20201231 +# I,0x00050657,0x05003102,20210308 +# I,0x0005065A,0x86000020,20201118 +# I,0x0005065B,0x07000020,20201120 # I,0x00050661,0xF1000008,20150130 # I,0x00050662,0x0000001C,20190617 # I,0x00050663,0x07000019,20190617 @@ -5844,59 +5842,65 @@ exit 0 # ok # I,0x000506A0,0x00000038,20150112 # I,0x000506C2,0x00000014,20180511 # I,0x000506C8,0x90011010,20160323 -# I,0x000506C9,0x00000040,20200227 +# I,0x000506C9,0x00000044,20201023 # I,0x000506CA,0x0000001E,20200227 # I,0x000506D1,0x00000102,20150605 # I,0x000506E0,0x00000018,20141119 # I,0x000506E1,0x0000002A,20150602 # I,0x000506E2,0x0000002E,20150815 -# I,0x000506E3,0x000000E2,20200714 +# I,0x000506E3,0x000000EA,20210125 # I,0x000506E8,0x00000034,20160710 # I,0x000506F0,0x00000010,20160607 -# I,0x000506F1,0x00000032,20200307 +# I,0x000506F1,0x00000034,20201023 # I,0x00060660,0x0000000C,20160821 # I,0x00060661,0x0000000E,20170128 # I,0x00060662,0x00000022,20171129 # I,0x00060663,0x0000002A,20180417 # I,0x000606A0,0x80000031,20200308 -# I,0x000606A4,0x8B0001B0,20200413 -# I,0x000606A5,0x8C000090,20200412 +# I,0x000606A4,0x0B000280,20200817 +# I,0x000606A5,0x0C0002F0,20210308 +# I,0x000606A6,0x0D0002A0,20210425 # I,0x000606E0,0x0000000B,20161104 # I,0x000606E1,0x00000108,20190423 # I,0x000706A0,0x00000026,20170712 -# I,0x000706A1,0x00000034,20200609 -# I,0x000706A8,0x00000018,20200609 +# I,0x000706A1,0x00000036,20201023 +# I,0x000706A8,0x0000001A,20201023 # I,0x000706E0,0x0000002C,20180614 # I,0x000706E1,0x00000042,20190420 # I,0x000706E2,0x00000042,20190420 # I,0x000706E3,0x81000008,20181002 # I,0x000706E4,0x00000046,20190905 -# I,0x000706E5,0x000000A0,20200730 +# I,0x000706E5,0x000000A6,20201101 # I,0x00080650,0x00000018,20180108 # I,0x000806A0,0x00000010,20190507 -# I,0x000806A1,0x00000028,20200626 +# I,0x000806A1,0x0000002A,20201106 # I,0x000806C0,0x00000068,20200402 -# I,0x000806C1,0x00000066,20200925 -# I,0x000806D0,0x0000002E,20200709 -# I,0x000806E9,0x000000DE,20200527 -# I,0x000806EA,0x000000E0,20200617 -# I,0x000806EB,0x000000DE,20200603 -# I,0x000806EC,0x000000DE,20200518 +# I,0x000806C1,0x0000008A,20210409 +# I,0x000806C2,0x00000016,20210407 +# I,0x000806D0,0x00000050,20201217 +# I,0x000806D1,0x0000002C,20210423 +# I,0x000806E9,0x000000EA,20210105 +# I,0x000806EA,0x000000EA,20210106 +# I,0x000806EB,0x000000EA,20210105 +# I,0x000806EC,0x000000EA,20210105 # I,0x00090660,0x80001001,20190918 -# I,0x000906E9,0x000000DE,20200526 -# I,0x000906EA,0x000000DE,20200525 -# I,0x000906EB,0x000000DE,20200525 -# I,0x000906EC,0x000000DE,20200603 -# I,0x000906ED,0x000000DE,20200524 +# I,0x00090670,0x00000019,20201111 +# I,0x000906C0,0x0000001D,20210323 +# I,0x000906E9,0x000000EA,20210105 +# I,0x000906EA,0x000000EA,20210105 +# I,0x000906EB,0x000000EA,20210105 +# I,0x000906EC,0x000000EA,20210105 +# I,0x000906ED,0x000000EA,20210105 # I,0x000A0650,0x000000BE,20191010 # I,0x000A0651,0x000000C2,20191113 -# I,0x000A0652,0x000000E0,20200708 -# I,0x000A0653,0x000000E0,20200708 +# I,0x000A0652,0x000000EA,20210207 +# I,0x000A0653,0x000000EA,20210308 # I,0x000A0654,0x000000C6,20200123 -# I,0x000A0655,0x000000E2,20200914 -# I,0x000A0660,0x000000E0,20200708 +# I,0x000A0655,0x000000EC,20210308 +# I,0x000A0660,0x000000E8,20201208 # I,0x000A0661,0x000000E0,20200702 -# I,0x000A0670,0x00000002,20200304 +# I,0x000A0670,0x0000002C,20201124 +# I,0x000A0671,0x00000040,20210411 # I,0x000A0680,0x80000002,20200121 # A,0x00000F00,0x02000008,20070614 # A,0x00000F01,0x0000001C,20021031 @@ -5959,6 +5963,7 @@ exit 0 # ok # A,0x00680F00,0x06000017,20101029 # A,0x00680F01,0x0600011F,20110227 # A,0x00680F10,0x06000410,20110314 +# A,0x00690F00,0x06001009,20110613 # A,0x00700F00,0x0700002A,20121218 # A,0x00700F01,0x07000110,20180209 # A,0x00730F00,0x07030009,20131206 @@ -5976,15 +5981,16 @@ exit 0 # ok # A,0x00820F00,0x08200002,20180214 # A,0x00820F01,0x08200103,20190417 # A,0x00830F00,0x08300027,20190401 -# A,0x00830F10,0x08301039,20200207 +# A,0x00830F10,0x0830104D,20200728 # A,0x00850F00,0x08500004,20180212 # A,0x00860F00,0x0860000E,20200127 # A,0x00860F01,0x08600106,20200619 -# A,0x00860F81,0x08608102,20200617 +# A,0x00860F81,0x08608103,20200702 # A,0x00870F00,0x08700004,20181206 # A,0x00870F10,0x08701021,20200125 # A,0x00A00F00,0x0A000033,20200413 -# A,0x00A00F10,0x0A00100F,20200624 +# A,0x00A00F10,0x0A00103F,20210105 +# A,0x00A00F11,0x0A00111D,20210202 # A,0x00A20F00,0x0A200025,20200121 # A,0x00A20F10,0x0A201009,20200821 -# A,0x00A50F00,0x0A50000B,20200821 +# A,0x00A50F00,0x0A50000C,20201208