Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two iscsi fixes.
One for an oops in the client which can be triggered by the server
authentication protocol and the other in the target code which causes
data corruption"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
scsi: target/iblock: Fix overrun in WRITE SAME emulation
+9
-9
+8
-8
drivers/target/iscsi/iscsi_target_auth.c
+8
-8
drivers/target/iscsi/iscsi_target_auth.c
···
81
81
return CHAP_DIGEST_UNKNOWN;
82
82
}
83
83
84
+
static void chap_close(struct iscsi_conn *conn)
85
+
{
86
+
kfree(conn->auth_protocol);
87
+
conn->auth_protocol = NULL;
88
+
}
89
+
84
90
static struct iscsi_chap *chap_server_open(
85
91
struct iscsi_conn *conn,
86
92
struct iscsi_node_auth *auth,
···
124
118
case CHAP_DIGEST_UNKNOWN:
125
119
default:
126
120
pr_err("Unsupported CHAP_A value\n");
127
-
kfree(conn->auth_protocol);
121
+
chap_close(conn);
128
122
return NULL;
129
123
}
130
124
···
139
133
* Generate Challenge.
140
134
*/
141
135
if (chap_gen_challenge(conn, 1, aic_str, aic_len) < 0) {
142
-
kfree(conn->auth_protocol);
136
+
chap_close(conn);
143
137
return NULL;
144
138
}
145
139
146
140
return chap;
147
-
}
148
-
149
-
static void chap_close(struct iscsi_conn *conn)
150
-
{
151
-
kfree(conn->auth_protocol);
152
-
conn->auth_protocol = NULL;
153
141
}
154
142
155
143
static int chap_server_compute_md5(