From: | "Tobias Scherbaum (dertobi123)" <dertobi123@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-block/open-iscsi/files: CVE-2009-1297.patch |
Date: | Tue, 27 Oct 2009 19:47:39 |
Message-Id: | E1N2s13-0007t5-2Z@stork.gentoo.org |
1 | dertobi123 09/10/27 19:47:37 |
2 | |
3 | Added: CVE-2009-1297.patch |
4 | Log: |
5 | Revbump, proxy-commiting for Craig (security bug #290631) |
6 | (Portage version: 2.2_rc46/cvs/Linux x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.1 sys-block/open-iscsi/files/CVE-2009-1297.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/open-iscsi/files/CVE-2009-1297.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/open-iscsi/files/CVE-2009-1297.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: CVE-2009-1297.patch |
15 | =================================================================== |
16 | --- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100 |
17 | +++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100 |
18 | @@ -104,24 +104,22 @@ |
19 | |
20 | connected=0 |
21 | discovered=0 |
22 | - df=/tmp/discovered.$$ |
23 | |
24 | dbg "starting discovery to $ip" |
25 | - iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df} |
26 | - while read portal target |
27 | + disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})" |
28 | + echo "${disc}" | while read portal target |
29 | do |
30 | portal=${portal%,*} |
31 | select_transport |
32 | - done < ${df} |
33 | + done |
34 | |
35 | - discovered=$(cat ${df} | wc -l) |
36 | + discovered=$(echo "${disc}" | wc -l) |
37 | if [ ${discovered} = 0 ]; then |
38 | echo "failed to discover targets at ${ip}" |
39 | exit 2 |
40 | else |
41 | echo "discovered ${discovered} targets at ${ip}" |
42 | fi |
43 | - /bin/rm -f ${df} |
44 | } |
45 | |
46 | try_login() |