summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2009-10-27 19:47:36 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2009-10-27 19:47:36 +0000
commitede811fc99b14b11d84e8ea9b9be39513e97531e (patch)
treed2af6e6996f944fb8cd7bfd4e11fef820ff182f2 /sys-block/open-iscsi/files
parentdrop versions that do compile, fix typos (diff)
downloadgentoo-2-ede811fc99b14b11d84e8ea9b9be39513e97531e.tar.gz
gentoo-2-ede811fc99b14b11d84e8ea9b9be39513e97531e.tar.bz2
gentoo-2-ede811fc99b14b11d84e8ea9b9be39513e97531e.zip
Revbump, proxy-commiting for Craig (security bug #290631)
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'sys-block/open-iscsi/files')
-rw-r--r--sys-block/open-iscsi/files/CVE-2009-1297.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/sys-block/open-iscsi/files/CVE-2009-1297.patch b/sys-block/open-iscsi/files/CVE-2009-1297.patch
new file mode 100644
index 000000000000..d1728fff7e65
--- /dev/null
+++ b/sys-block/open-iscsi/files/CVE-2009-1297.patch
@@ -0,0 +1,31 @@
+--- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100
++++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100
+@@ -104,24 +104,22 @@
+
+ connected=0
+ discovered=0
+- df=/tmp/discovered.$$
+
+ dbg "starting discovery to $ip"
+- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
+- while read portal target
++ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
++ echo "${disc}" | while read portal target
+ do
+ portal=${portal%,*}
+ select_transport
+- done < ${df}
++ done
+
+- discovered=$(cat ${df} | wc -l)
++ discovered=$(echo "${disc}" | wc -l)
+ if [ ${discovered} = 0 ]; then
+ echo "failed to discover targets at ${ip}"
+ exit 2
+ else
+ echo "discovered ${discovered} targets at ${ip}"
+ fi
+- /bin/rm -f ${df}
+ }
+
+ try_login()