diff options
| author | Thomas Penteker <tek@serverop.de> | 2014-04-16 17:52:19 +0200 |
|---|---|---|
| committer | Thomas Penteker <tek@serverop.de> | 2014-04-16 17:52:19 +0200 |
| commit | 4d7357b645153a53331b42bfc6ccabf201583ad3 (patch) | |
| tree | 85168ddbaa42f39178330ec61fb973c8b95dd8e0 /qemu-all | |
| parent | 804835333c8dccb4aaf19da02b0f92b184466346 (diff) | |
| download | opt-4d7357b645153a53331b42bfc6ccabf201583ad3.tar.gz opt-4d7357b645153a53331b42bfc6ccabf201583ad3.tar.xz | |
qemu-all: include patch for SMART-related buffer overflow
Diffstat (limited to 'qemu-all')
| -rw-r--r-- | qemu-all/.md5sum | 1 | ||||
| -rw-r--r-- | qemu-all/Pkgfile | 7 | ||||
| -rw-r--r-- | qemu-all/ide-smart.diff | 13 |
3 files changed, 19 insertions, 2 deletions
diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum index 61f74737e..a1745ce34 100644 --- a/qemu-all/.md5sum +++ b/qemu-all/.md5sum @@ -1 +1,2 @@ +0afe916c82b3ec2ed4ff8ee2590c0f5c ide-smart.diff 9541063d999cf9659ed7fdce71314f31 qemu-1.7.1.tar.bz2 diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile index 5f51346b8..9f4b0087d 100644 --- a/qemu-all/Pkgfile +++ b/qemu-all/Pkgfile @@ -7,11 +7,14 @@ name=qemu-all version=1.7.1 -release=1 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) +release=2 +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 ide-smart.diff) build() { cd qemu-$version + + patch -p1 -i $SRC/ide-smart.diff + ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ --host-cc="${CC:=gcc}" \ diff --git a/qemu-all/ide-smart.diff b/qemu-all/ide-smart.diff new file mode 100644 index 000000000..0d3cdeb2d --- /dev/null +++ b/qemu-all/ide-smart.diff @@ -0,0 +1,13 @@ +diff --git a/hw/ide/core.c b/hw/ide/core.c +index e1dfe54..c943a4d 100644 +--- a/hw/ide/core.c ++++ b/hw/ide/core.c +@@ -1602,7 +1602,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd) + case 2: /* extended self test */ + s->smart_selftest_count++; + if (s->smart_selftest_count > 21) { +- s->smart_selftest_count = 0; ++ s->smart_selftest_count = 1; + } + n = 2 + (s->smart_selftest_count - 1) * 24; + s->smart_selftest_data[n] = s->sector; |