mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-23 21:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2015-08-04 22:13:35 -07:00
parent 38f43250c5 4c79dee448
commit 6c3bcc7214
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
iscsi-scst/kernel/isert-scst/isert.c
View File

@@ -55,7 +55,7 @@ unsigned long isert_trace_flag = ISERT_DEFAULT_LOG_FLAGS;
static unsigned int isert_nr_devs = ISERT_NR_DEVS;
module_param(isert_nr_devs, uint, S_IRUGO);
MODULE_PARM_DESC(isert_nr_devs,
"Maximum concurrent number of connection requests to handle.");
"Maximum concurrent number of connection requests to handle (up to 999).");
static void isert_mark_conn_closed(struct iscsi_conn *conn, int flags)
{
@@ -485,6 +485,13 @@ static int __init isert_init_module(void)
{
int ret;
if (isert_nr_devs > 999) {
PRINT_ERROR("Invalid argument for isert_nr_devs provded: %d\n",
isert_nr_devs);
ret = -EINVAL;
goto out;
}
ret = iscsit_reg_transport(&isert_transport);
if (unlikely(ret))
goto out;

6
iscsi-scst/kernel/isert-scst/isert_login.c
View File

@@ -333,6 +333,7 @@ static ssize_t isert_listen_read(struct file *filp, char __user *buf,
struct isert_conn_dev *conn_dev;
int res = 0;
char k_buff[sizeof("/dev/") + sizeof(ISER_CONN_DEV_PREFIX) + 3 + 1];
size_t to_write;
TRACE_ENTRY();
@@ -357,8 +358,9 @@ wait_for_connection:
list_move(&conn_dev->conn_list_entry, &dev->curr_conn_list);
spin_unlock(&dev->conn_lock);
res = snprintf(k_buff, sizeof(k_buff), "/dev/"ISER_CONN_DEV_PREFIX"%d",
conn_dev->idx);
to_write = min_t(size_t, sizeof(k_buff), count);
res = scnprintf(k_buff, to_write, "/dev/"ISER_CONN_DEV_PREFIX"%d",
conn_dev->idx);
++res; /* copy trailing \0 as well */
if (unlikely(copy_to_user(buf, k_buff, res)))

6
nightly/conf/nightly.conf
View File

@@ -3,18 +3,18 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
4.1.3 \
4.1.4 \
4.0.9-nc \
3.19.7-nc \
3.18.19-nc \
3.17.8-nc \
3.16.7-nc \
3.15.10-nc \
3.14.48-nc \
3.14.49-nc \
3.13.11-nc \
3.12.44-nc \
3.11.10-nc \
3.10.84-nc \
3.10.85-nc \
3.9.11-nc \
3.8.13-nc \
3.7.10-nc \