Commit cea4dcfd authored by Kees Cook's avatar Kees Cook Committed by Nicholas Bellinger

iscsi-target: fix heap buffer overflow on error

If a key was larger than 64 bytes, as checked by iscsi_check_key(), the
error response packet, generated by iscsi_add_notunderstood_response(),
would still attempt to copy the entire key into the packet, overflowing
the structure on the heap.

Remote preauthentication kernel memory corruption was possible if a
target was configured and listening on the network.

CVE-2013-2850
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 21363ca8
...@@ -758,9 +758,9 @@ static int iscsi_add_notunderstood_response( ...@@ -758,9 +758,9 @@ static int iscsi_add_notunderstood_response(
} }
INIT_LIST_HEAD(&extra_response->er_list); INIT_LIST_HEAD(&extra_response->er_list);
strncpy(extra_response->key, key, strlen(key) + 1); strlcpy(extra_response->key, key, sizeof(extra_response->key));
strncpy(extra_response->value, NOTUNDERSTOOD, strlcpy(extra_response->value, NOTUNDERSTOOD,
strlen(NOTUNDERSTOOD) + 1); sizeof(extra_response->value));
list_add_tail(&extra_response->er_list, list_add_tail(&extra_response->er_list,
&param_list->extra_response_list); &param_list->extra_response_list);
...@@ -1629,8 +1629,6 @@ int iscsi_decode_text_input( ...@@ -1629,8 +1629,6 @@ int iscsi_decode_text_input(
if (phase & PHASE_SECURITY) { if (phase & PHASE_SECURITY) {
if (iscsi_check_for_auth_key(key) > 0) { if (iscsi_check_for_auth_key(key) > 0) {
char *tmpptr = key + strlen(key);
*tmpptr = '=';
kfree(tmpbuf); kfree(tmpbuf);
return 1; return 1;
} }
......
#ifndef ISCSI_PARAMETERS_H #ifndef ISCSI_PARAMETERS_H
#define ISCSI_PARAMETERS_H #define ISCSI_PARAMETERS_H
#include <scsi/iscsi_proto.h>
struct iscsi_extra_response { struct iscsi_extra_response {
char key[64]; char key[KEY_MAXLEN];
char value[32]; char value[32];
struct list_head er_list; struct list_head er_list;
} ____cacheline_aligned; } ____cacheline_aligned;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment