linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Anatol Pomazau <anatol@google.com>,
	Frank Mayhar <fmayhar@google.com>,
	Bharath Ravi <rbharath@google.com>,
	Khazhimsel Kumykov <khazhy@google.com>,
	Gabriel Krisman Bertazi <krisman@collabora.com>,
	Lee Duncan <lduncan@suse.com>,
	"Martin K . Petersen" <martin.petersen@oracle.com>,
	Sasha Levin <sashal@kernel.org>,
	open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 61/79] scsi: iscsi: Don't send data to unbound connection
Date: Wed, 11 Dec 2019 10:26:25 -0500	[thread overview]
Message-ID: <20191211152643.23056-61-sashal@kernel.org> (raw)
In-Reply-To: <20191211152643.23056-1-sashal@kernel.org>

From: Anatol Pomazau <anatol@google.com>

[ Upstream commit 238191d65d7217982d69e21c1d623616da34b281 ]

If a faulty initiator fails to bind the socket to the iSCSI connection
before emitting a command, for instance, a subsequent send_pdu, it will
crash the kernel due to a null pointer dereference in sock_sendmsg(), as
shown in the log below.  This patch makes sure the bind succeeded before
trying to use the socket.

BUG: kernel NULL pointer dereference, address: 0000000000000018
 #PF: supervisor read access in kernel mode
 #PF: error_code(0x0000) - not-present page
PGD 0 P4D 0
Oops: 0000 [#1] SMP PTI
CPU: 3 PID: 7 Comm: kworker/u8:0 Not tainted 5.4.0-rc2.iscsi+ #13
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014
[   24.158246] Workqueue: iscsi_q_0 iscsi_xmitworker
[   24.158883] RIP: 0010:apparmor_socket_sendmsg+0x5/0x20
[...]
[   24.161739] RSP: 0018:ffffab6440043ca0 EFLAGS: 00010282
[   24.162400] RAX: ffffffff891c1c00 RBX: ffffffff89d53968 RCX: 0000000000000001
[   24.163253] RDX: 0000000000000030 RSI: ffffab6440043d00 RDI: 0000000000000000
[   24.164104] RBP: 0000000000000030 R08: 0000000000000030 R09: 0000000000000030
[   24.165166] R10: ffffffff893e66a0 R11: 0000000000000018 R12: ffffab6440043d00
[   24.166038] R13: 0000000000000000 R14: 0000000000000000 R15: ffff9d5575a62e90
[   24.166919] FS:  0000000000000000(0000) GS:ffff9d557db80000(0000) knlGS:0000000000000000
[   24.167890] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[   24.168587] CR2: 0000000000000018 CR3: 000000007a838000 CR4: 00000000000006e0
[   24.169451] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[   24.170320] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[   24.171214] Call Trace:
[   24.171537]  security_socket_sendmsg+0x3a/0x50
[   24.172079]  sock_sendmsg+0x16/0x60
[   24.172506]  iscsi_sw_tcp_xmit_segment+0x77/0x120
[   24.173076]  iscsi_sw_tcp_pdu_xmit+0x58/0x170
[   24.173604]  ? iscsi_dbg_trace+0x63/0x80
[   24.174087]  iscsi_tcp_task_xmit+0x101/0x280
[   24.174666]  iscsi_xmit_task+0x83/0x110
[   24.175206]  iscsi_xmitworker+0x57/0x380
[   24.175757]  ? __schedule+0x2a2/0x700
[   24.176273]  process_one_work+0x1b5/0x360
[   24.176837]  worker_thread+0x50/0x3c0
[   24.177353]  kthread+0xf9/0x130
[   24.177799]  ? process_one_work+0x360/0x360
[   24.178401]  ? kthread_park+0x90/0x90
[   24.178915]  ret_from_fork+0x35/0x40
[   24.179421] Modules linked in:
[   24.179856] CR2: 0000000000000018
[   24.180327] ---[ end trace b4b7674b6df5f480 ]---

Signed-off-by: Anatol Pomazau <anatol@google.com>
Co-developed-by: Frank Mayhar <fmayhar@google.com>
Signed-off-by: Frank Mayhar <fmayhar@google.com>
Co-developed-by: Bharath Ravi <rbharath@google.com>
Signed-off-by: Bharath Ravi <rbharath@google.com>
Co-developed-by: Khazhimsel Kumykov <khazhy@google.com>
Signed-off-by: Khazhimsel Kumykov <khazhy@google.com>
Co-developed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Reviewed-by: Lee Duncan <lduncan@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/scsi/iscsi_tcp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 23354f206533b..55181d28291e7 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -374,8 +374,16 @@ static int iscsi_sw_tcp_pdu_xmit(struct iscsi_task *task)
 {
 	struct iscsi_conn *conn = task->conn;
 	unsigned int noreclaim_flag;
+	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
+	struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;
 	int rc = 0;
 
+	if (!tcp_sw_conn->sock) {
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "Transport not bound to socket!\n");
+		return -EINVAL;
+	}
+
 	noreclaim_flag = memalloc_noreclaim_save();
 
 	while (iscsi_sw_tcp_xmit_qlen(conn)) {
-- 
2.20.1


  parent reply	other threads:[~2019-12-11 15:42 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-11 15:25 [PATCH AUTOSEL 4.19 01/79] scsi: lpfc: Fix discovery failures when target device connectivity bounces Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 02/79] scsi: mpt3sas: Fix clear pending bit in ioctl status Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 03/79] scsi: lpfc: Fix locking on mailbox command completion Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 04/79] Input: atmel_mxt_ts - disable IRQ across suspend Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 05/79] f2fs: fix to update time in lazytime mode Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 06/79] iommu: rockchip: Free domain on .domain_free Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 07/79] iommu/tegra-smmu: Fix page tables in > 4 GiB memory Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 08/79] dmaengine: xilinx_dma: Clear desc_pendingcount in xilinx_dma_reset Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 09/79] scsi: target: compare full CHAP_A Algorithm strings Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 10/79] scsi: lpfc: Fix SLI3 hba in loop mode not discovering devices Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 11/79] scsi: csiostor: Don't enable IRQs too early Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 12/79] scsi: hisi_sas: Replace in_softirq() check in hisi_sas_task_exec() Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 13/79] powerpc/pseries: Mark accumulate_stolen_time() as notrace Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 14/79] powerpc/pseries: Don't fail hash page table insert for bolted mapping Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 15/79] powerpc/tools: Don't quote $objdump in scripts Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 16/79] dma-debug: add a schedule point in debug_dma_dump_mappings() Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 17/79] leds: lm3692x: Handle failure to probe the regulator Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 18/79] leds: trigger: netdev: fix handling on interface rename Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 19/79] clocksource/drivers/asm9260: Add a check for of_clk_get Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 20/79] clocksource/drivers/timer-of: Use unique device name instead of timer Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 21/79] powerpc/security/book3s64: Report L1TF status in sysfs Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 22/79] powerpc/book3s64/hash: Add cond_resched to avoid soft lockup warning Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 23/79] ext4: update direct I/O read lock pattern for IOCB_NOWAIT Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 24/79] ext4: iomap that extends beyond EOF should be marked dirty Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 25/79] jbd2: Fix statistics for the number of logged blocks Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 26/79] scsi: tracing: Fix handling of TRANSFER LENGTH == 0 for READ(6) and WRITE(6) Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 27/79] scsi: lpfc: Fix duplicate unreg_rpi error in port offline flow Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 28/79] f2fs: fix to update dir's i_pino during cross_rename Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 29/79] clk: qcom: Allow constant ratio freq tables for rcg Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 30/79] clk: clk-gpio: propagate rate change to parent Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 31/79] irqchip/irq-bcm7038-l1: Enable parent IRQ if necessary Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 32/79] irqchip: ingenic: Error out if IRQ domain creation failed Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 33/79] mfd: mfd-core: Honour Device Tree's request to disable a child-device Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 34/79] fs/quota: handle overflows of sysctl fs.quota.* and report as unsigned long Sasha Levin
2019-12-11 15:25 ` [PATCH AUTOSEL 4.19 35/79] scsi: lpfc: fix: Coverity: lpfc_cmpl_els_rsp(): Null pointer dereferences Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 36/79] scsi: zorro_esp: Limit DMA transfers to 65536 bytes (except on Fastlane) Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 37/79] PCI: rpaphp: Fix up pointer to first drc-info entry Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 38/79] scsi: ufs: fix potential bug which ends in system hang Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 39/79] powerpc/pseries/cmm: Implement release() function for sysfs device Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 40/79] PCI: rpaphp: Don't rely on firmware feature to imply drc-info support Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 41/79] PCI: rpaphp: Annotate and correctly byte swap DRC properties Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 42/79] PCI: rpaphp: Correctly match ibm, my-drc-index to drc-name when using drc-info Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 43/79] powerpc/security: Fix wrong message when RFI Flush is disable Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 44/79] scsi: atari_scsi: sun3_scsi: Set sg_tablesize to 1 instead of SG_NONE Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 45/79] clk: pxa: fix one of the pxa RTC clocks Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 46/79] bcache: at least try to shrink 1 node in bch_mca_scan() Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 47/79] HID: quirks: Add quirk for HP MSU1465 PIXART OEM mouse Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 48/79] ext4: fix a bug in ext4_wait_for_tail_page_commit Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 49/79] HID: logitech-hidpp: Silence intermittent get_battery_capacity errors Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 50/79] ARM: 8937/1: spectre-v2: remove Brahma-B53 from hardening Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 51/79] libnvdimm/btt: fix variable 'rc' set but not used Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 52/79] HID: Improve Windows Precision Touchpad detection Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 53/79] HID: rmi: Check that the RMI_STARTED bit is set before unregistering the RMI transport device Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 54/79] watchdog: aspeed: Fix clock behaviour for ast2600 Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 55/79] watchdog: Fix the race between the release of watchdog_core_data and cdev Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 56/79] ext4: work around deleting a file with i_nlink == 0 safely Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 57/79] scsi: pm80xx: Fix for SATA device discovery Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 58/79] scsi: ufs: Fix error handing during hibern8 enter Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 59/79] scsi: scsi_debug: num_tgts must be >= 0 Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 60/79] scsi: NCR5380: Add disconnect_mask module parameter Sasha Levin
2019-12-11 15:26 ` Sasha Levin [this message]
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 62/79] scsi: target: iscsi: Wait for all commands to finish before freeing a session Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 63/79] gpio: mpc8xxx: Don't overwrite default irq_set_type callback Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 64/79] apparmor: fix unsigned len comparison with less than zero Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 65/79] scripts/kallsyms: fix definitely-lost memory leak Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 66/79] powerpc: Don't add -mabi= flags when building with Clang Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 67/79] f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project() Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 68/79] of: unittest: fix memory leak in attach_node_and_children Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 69/79] cdrom: respect device capabilities during opening action Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 70/79] perf script: Fix invalid LBR/binary mismatch error Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 71/79] perf script: Fix brstackinsn for AUXTRACE Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 72/79] perf regs: Make perf_reg_name() return "unknown" instead of NULL Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 73/79] s390/zcrypt: handle new reply code FILTERED_BY_HYPERVISOR Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 74/79] libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 75/79] s390/cpum_sf: Check for SDBT and SDB consistency Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 76/79] ocfs2: fix passing zero to 'PTR_ERR' warning Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 77/79] mailbox: imx: Fix Tx doorbell shutdown path Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 78/79] kernel: sysctl: make drop_caches write-only Sasha Levin
2019-12-11 15:26 ` [PATCH AUTOSEL 4.19 79/79] userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191211152643.23056-61-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=anatol@google.com \
    --cc=fmayhar@google.com \
    --cc=khazhy@google.com \
    --cc=krisman@collabora.com \
    --cc=lduncan@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=open-iscsi@googlegroups.com \
    --cc=rbharath@google.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).