From 96dc6e7ebd85ca6867da4814da056b9c366139ce Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 25 Oct 2018 22:41:41 +0200 Subject: [PATCH] socket: check for malloc failure before dereference Signed-off-by: David Disseldorp --- lib/socket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/socket.c b/lib/socket.c index 4aa0d9a..f1fca1b 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -601,11 +601,15 @@ iscsi_read_from_socket(struct iscsi_context *iscsi) do { if (iscsi->incoming == NULL) { iscsi->incoming = iscsi_szmalloc(iscsi, sizeof(struct iscsi_in_pdu)); - iscsi->incoming->hdr = iscsi_smalloc(iscsi, ISCSI_HEADER_SIZE); if (iscsi->incoming == NULL) { iscsi_set_error(iscsi, "Out-of-memory: failed to malloc iscsi_in_pdu"); return -1; } + iscsi->incoming->hdr = iscsi_smalloc(iscsi, ISCSI_HEADER_SIZE); + if (iscsi->incoming->hdr == NULL) { + iscsi_set_error(iscsi, "Out-of-memory"); + return -1; + } } in = iscsi->incoming;