summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * iscsid: Add NO_SYSTEMD to CFLAGSFabian Möller2021-01-251-0/+2
|/ | | | | | | When building with NO_SYSTEMD=1 set the -DNO_SYSTEMD CFLAG, otherwise the iscsid build tries to include the systemd header and aborts: iscsid.c:38:10: fatal error: systemd/sd-daemon.h: No such file or directory
* Merge pull request #244 from patsoffice/patsoffice/dir-perm-fix-RH-versionLee Duncan2021-01-186-15/+15
|\ | | | | Change mkdir permissions to 0770, adjust umask
| * Change mkdir permissions to 0770, adjust usmaskPatrick Lawrence2021-01-126-15/+15
| | | | | | | | | | | | | | - Change mkdir() permissions from 0660 to 0770 so that there are not SELinux dac_override violations. - Adjust the umask to preserve execute bit permission on directories created in iscsid and iscsiadm.
* | Merge pull request #243 from abvr/patch-1Lee Duncan2021-01-121-2/+2
|\ \ | | | | | | Fix typo in util.py
| * | Fix typo in util.pyAbhinav Rajagopalan2021-01-111-2/+2
|/ / | | | | Fix s/sttderr/stderr typo in line 179 of util.py
* | Merge pull request #239 from wenchao-hao/masterLee Duncan2021-01-055-19/+55
|\ \ | | | | | | Fix 4 memory leak in source code
| * | iscsiadm: Fix memory leak in iscsiadmWenchao Hao2020-12-302-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memory allocated by iscsi_context_new() would not be freed if error occurred during parameters parser stage and goto free_ifaces is used to jump to resource clean. Since all resource clean is performed after verified, so change all goto free_ifaces to goto out where handles resource better. Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
| * | libopeniscsiusr: Fix memory leak in iscsi_sessions_get()Wenchao Hao2020-12-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If _iscsi_sids_get() gets 0 session, *session_count is 0, while calloc(*session_count, ...) might return a valid pointer although *session_count is 0. The memory allocated by calloc() would be freed in iscsi_session_free() where did not perform free operation if session_count is zero. So memory leak would occur if _iscsi_sids_get() gets 0 session, this patch just goto out on if _iscsi_sids_get() gets 0 session to avoid calloc() being called. Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
| * | libopeniscsiusr: Fix memory leak in iscsi_nodes_get()Wenchao Hao2020-12-291-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If _scandir() gets 0 node, *node_count is 0, while calloc(*node_count, ...) might return a valid pointer although *node_count is 0. The memory allocated by calloc() would be freed in iscsi_nodes_free() where did not perform free operation if node_count is zero. So memory leak might occur if _scandir() get 0 node. Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
| * | idbm: Fix memory leak and NULL pointer dereference in idbm_rec_update_param()Wenchao Hao2020-12-291-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three memory issues in this function: 1. did not verify return value of calloc(), strdup() or malloc(); 2. memory leak of pointer tmp_value caused strsep() tmp_value would change after strsep() and free(tmp_value) would cause memory leak; 3. memory leak of pointer "found", the memory was allocated but did not freed Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
* | | Merge pull request #238 from jnschaeffer/add-iscsi-init-serviceLee Duncan2021-01-041-0/+1
|\ \ \ | | | | | | | | Add etc/systemd/iscsi-init.service to SYSTEMDFILES Makefile variable
| * | | Add etc/systemd/iscsi-init.service to SYSTEMDFILES Makefile variableJohn Schaeffer2020-12-271-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | iscsi-init.service is not included in the SYSTEMDFILES Makefile variable, causing it to be skipped when the install_systemd rule is executed. This causes the iscsi systemd service to fail on a fresh install, as it requires the iscsi-init service. This commit adds etc/systemd/iscsi-init.service to the list of files in SYSTEMDFILES to correct this issue.
* | | iscsid: Do not allow conflicting pid-file optionsLee Duncan2021-01-042-11/+31
|/ / | | | | | | | | | | The daemon allowed both the no-pid-file option and specifying a PID file to use, and honored which ever option was supplied last. This commmit ensures non-conflicting options are supplied.
* | Merge pull request from GHSA-r278-fm99-8rgp2.1.3Chris Leech2020-12-184-13/+80
|\ \ | | | | | | iscsiuio uIP input packet processing bounds checking fixes
| * | Preparing for version 2.1.3Chris Leech2020-12-183-2/+48
| | |
| * | check for TCP urgent pointer past end of frameChris Leech2020-12-181-5/+10
| | | | | | | | | | | | CVE-2020-17437
| * | check for u8 overflow when processing TCP optionsChris Leech2020-12-181-5/+15
| | | | | | | | | | | | CVE-2020-13988
| * | check for header length underflow during checksum calculationChris Leech2020-12-181-1/+7
|/ / | | | | | | CVE-2020-13987
* | Merge pull request #234 from wenchao-hao/masterLee Duncan2020-12-1314-21/+107
|\ \ | | | | | | fix several issues reported by a Coverity scan
| * | fwparam_ppc: Fix memory leak in fwparam_ppc.cWenchao Hao2020-12-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calloc() is called because loop_devs() to allocate memory which stored in array ofwdev. These memory should be freed at the end. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | iscsiuio: Remove unused macro IFNAMSIZ defined in iscsid_ipc.cWenchao Hao2020-12-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IFNAMSIZ is not used in this file. IFNAMSIZ is a macro defined in net/if.h. Maybe this this macro is defined here to give it a self defined value rather than system pre-defined at beginning, while it seems the code reference the macro in this file is removed, so here we can remove it. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | fwparam_ppc: Fix illegal memory access in fwparam_ppc.cWenchao Hao2020-12-121-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootpath_val is allocated in find_file() and referenced if find_file() excute successfully, while it was freed in find_file() and dereferenced after find_file() if find_file() returns 1. This patch remove free(bootpath_val) in find_file() and free bootpath_val when it is used done. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | sysfs: Verify parameter of sysfs_device_get()Wenchao Hao2020-12-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | In sysfs_device_get() we should firstly check whether devpath pointer is NULL before accessing it Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | fwparam_ppc: Fix NULL pointer dereference in find_devtree()Wenchao Hao2020-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If strdup() returns NULL, find_devtree() just return NULL to indicate this function execute failed. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | open-iscsi: Clean user_param list when process exitWenchao Hao2020-12-124-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both in iscsiadm and iscsistart, a list is initialized to management struct iscsi_param which allocated by idbm_alloc_user_param(). While both of iscsiadm and iscsistart did not free these iscsi_param when process exit, this patch add a free flow when process exit. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | iscsi_net_util: Fix NULL pointer dereference in find_vlan_dev()Wenchao Hao2020-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | if_nameindex() returns NULL on error, if it returns NULL, we just print the error info and return NULL. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | open-iscsi: Fix NULL pointer dereference in mgmt_ipc_read_req()Wenchao Hao2020-12-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | If malloc() returns NULL on fail, we should return -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | open-iscsi: Fix invalid pointer deference in find_initiator()Wenchao Hao2020-12-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | If calloc() returns NULL just return ENOMEM; if strdup() returns NULL we should free dev and return errno. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
| * | iscsiuio: Fix invalid parameter when call fstat()Wenchao Hao2020-12-122-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both qedi_open() and bnx2x_open() perform 15 times retry to make system call open() successful, while this retry mechanism can not make sure open() can execute successfully. So this patch verify return value of open(), if it is still INVALID_FD just print error info and return the errno. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
| * | iscsi-iname: Verify open() return value before calling read()Wenchao Hao2020-12-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | System call open() might return -1 if an error occurred which should be taken into consideration. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | iscsi_sysfs: Fix NULL pointer deference in iscsi_sysfs_read_ifaceWenchao Hao2020-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Check if t is valid before accessing it. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com>
| * | Update .gitignore for cscope and gtags data baseWenchao Hao2020-12-121-0/+5
|/ / | | | | | | Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
* | Merge pull request #233 from wenchao-hao/masterLee Duncan2020-11-301-52/+37
|\ \ | | | | | | iscsiadm: Optimize the the verification of mode paramters by doing so sooner and in one place.
| * | iscsiadm: Optimize the the verification of mode paramtersWenchao Hao2020-11-231-52/+37
|/ / | | | | | | | | | | | | | | | | | | The mode parameters should be check earlier when recognize the mode, rather than mutiple calls after all commandline parameters are parsed. Signed-off-by: Wenchao Hao <haowenchao@huawei.com> Signed-off-by: Wu Bo <wubo40@huawei.com> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
* | Merge pull request #229 from gulams/masterLee Duncan2020-11-173-2/+3
|\ \ | | | | | | iscsid: Poll timeout value to 1 minute for iscsid
| * | iscsid: Poll timeout value to 1 minute for iscsidGulam Mohamed2020-11-173-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description =========== This patch has the following two changes ------------------------------------------ Change 1: Specify the poll timeout value to 1 minute as third parameter to the function iscsid_exec_req() when called from sync_session() Reason: Currently the poll timeout value sent sent to iscsid_response() from iscsid_exec_req() is "info->iscsid_req_tmo" which is -1 as set in "iscsi_sysfs_for_each_session()". When iscsid_response() receives this -1, it sets the timeout value to ISCSID_REQ_TIMEOUT (1000 ms) and also sets a local variable "poll_wait" to 1. There is a while loop below this which checks the value of "poll_wait". If "poll_wait" is set to 1, then it calls "continue". For sessions which are giving continuous connection errors (like target service stopped OR target node is shutdown OR any other continuous connection errors etc ...), this results in an indefinite while loop, as nothing will be written to the poll fd, resulting in further sessions not getting synced (or recovered) when the iscsid is restarted due to any reason (either manual restart of iscsid or rpm install). Poll timeout of 1 minute seems to be a reasonable value for the slow connections Change 2: Change the return error code from the function iscsid_response() to ISCSI_ERR_SESSION_NOT_CONNECTED when the poll times out and returns error 0 Reason: Currently the iscsid_response() function returns ISCSI_ERR_ISCSID_NOTCONN error code in case if the poll times out and the poll_wait variable is 0 (i.e poll timeout sent to iscsid_response() was -1). Returning this error code doesn't seem to be correct for the following two reasons: a. ISCSI_ERR_ISCSID_NOTCONN should be returned only when we are not able to connect to iscsid but we are in iscsid_response() function indicating that we were able to connect to iscsid successfully b. When ISCSI_ERR_ISCSID_NOTCONN is returned, the sync_session() will retry the request till 30 retries are reached. This causes an overlap of multiple "iscsi login task" in kernel and the kernel will return an error to the user-space indicating "Login/Text in progress. Cannot start new task.". This is repeated continuously which results in session not getting recovered even after it comes back up. Also at one point of time we observed that the kernel panics in "iscsi_sw_tcp_conn_set_param()" while trying to set the param ISCSI_PARAM_DATADGST_EN. We have a kernel fix for this panic which is in review for upstream
* | | Merge pull request #231 from yoshkosh/masterLee Duncan2020-11-162-2/+2
|\ \ \ | | | | | | | | iscsid: fix logging level when starting and shutting down daemon
| * | | iscsid: fix logging level when starting and shutting down daemonYoshifumi Kinoshita2020-11-112-2/+2
| | | |
* | | | iscsiadm: fix host stats mode coredumpLee Duncan2020-11-141-2/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command: > iscsiadm -m host -C stats -H <mac_addr> Copies in the user-supplied mac address without checking its length, but the maximum length is 17 characters. This overflows the next field in the structure, or if libc checking is enabled, produces this error: > *** buffer overflow detected ***: iscsiadm terminated Fix this by checking the length of the supply MAC address before copying it into the array. Some extra debugging error messages were added in the process.
* | | Merge pull request #230 from wenchao-hao/masterLee Duncan2020-11-101-1/+5
|\ \ \ | | | | | | | | Fix memory leak in sysfs_get_str
| * | | Fix memory leak in sysfs_get_strWenchao Hao2020-11-041-1/+5
| |/ / | | | | | | | | | | | | | | | | | | strlen(sysfs_value) return 0 do not mean sysfs_value is NULL and this memory should be freed Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
* | | Merge pull request #227 from kraj/masterLee Duncan2020-11-101-1/+1
|\ \ \ | | | | | | | | libopeniscsiusr: Compare with max int instead of max long
| * | | libopeniscsiusr: Compare with max int instead of max longKhem Raj2020-10-211-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This compares value member of int_list_tbl struct which is of unsigned int type. struct int_list_tbl { const char *name; unsigned int value; }; Clang compiler reports this comparison when -Wtautological-constant-out-of-range-compare is enabled | idbm.c:1042:2: error: result of comparison of constant 18446744073709551615 with expression of type 'unsigned int' is always true [-Werror,-Wtautological-constant-out-of-range-compare] | _rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | idbm.c:263:23: note: expanded from macro '_rec_int_list' | if (_org->_name[_i] != ~0UL) { \ | ~~~~~~~~~~~~~~~ ^ ~~~~ Since max value for int can be less than unsinged long e.g. on LP64 its better to use UINT_MAX here Signed-off-by: Khem Raj <raj.khem@gmail.com>
* | | Updated iscsiadm man page.Lee Duncan2020-11-091-36/+70
|/ / | | | | | | | | | | Fixed some quoting and spacing, but also cleaned up list of transports, as they were seriously out of date.
* | TODO: Update to todo list.sonukumar159842@gmail.com2020-10-131-0/+13
| | | | | | | | | | This patch is to update the todo list. Tasks are suggested by The Lee-Man
* | Implement login "no_wait" for iscsiadm NODE modeLee Duncan2020-10-083-38/+54
| | | | | | | | | | | | | | | | | | Commit 46183ffd36c9 added the "-W"/"--no_wait" flag to iscsiadm, in "node" mode, when doing loginall. This commit adds this functionality to mode node when logging into a single target. The man page was also updated, as was the README file, where appropriate.
* | Merge pull request #224 from cleech/for_upstreamChris Leech2020-09-211-0/+1
|\ \ | | | | | | iscsiadm buffer overflow regression when discovering many targets at …
| * | iscsiadm buffer overflow regression when discovering many targets at onceChris Leech2020-09-171-0/+1
|/ / | | | | | | | | | | int_list type didn't zero the output string, so as the rec struct was reused repeatedly during discovery it would keep growing with repeated values triggering a strcat buffer overflow
* | Merge pull request #221 from gulams/masterLee Duncan2020-09-101-1/+6
|\ \ | | | | | | Check Invalid Session id for stop connection
| * | iscsid: Check Invalid Session id for stop connectiongulams2020-09-101-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: If the initiator is rebooting then after the reboot, it will try to resync (recreate) the existing the connections by reading the sysfs. While initiator is doing this, i.e when the initiator tries to connect to the target but if the target service is not yet started, then the initiator connection will fail. The session id is also not yet assigned and it will be at its initial value 0xFFFFFFFF which is invalid. The session id is assigned a valid value only after a successful connection. Since the connection is failed, the initiator code will queue the connection for re-open. The connection state is still at ISCSI_CONN_STATE_XPT_WAIT as its very first login attemp after the reboot. Due to my Pull #206 request the code will invoke the stop connection to decrement the socket_fd reference count to properly close the connecion (details are in pull request #206). But since the session id is not valid, the stop connection will fail and the code will go ahead and queue the re-open without attempting the connect again. This is repeated till 120 seconds (stop connection failing and requeuing the reopen without invoking connect) and the connection will be shutdown resulting the storage unavailable. Fix: We need to check the validity of the session id before calling the stop connection. If the session id is valid then only invoke the stop connection. Due to this, the code will go ahead and attempt the connet call. If the target service comes up anytime in 120 seconds, then the connect will be successful and we will get connected to the target.
View Lorry Controller Status