From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752755AbdGYTVT (ORCPT ); Tue, 25 Jul 2017 15:21:19 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34014 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751524AbdGYTVN (ORCPT ); Tue, 25 Jul 2017 15:21:13 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bart Van Assche , Juergen Gross , Christoph Hellwig , Hannes Reinecke , David Disseldorp , xen-devel@lists.xenproject.org, Nicholas Bellinger Subject: [PATCH 4.9 037/125] xen/scsiback: Fix a TMR related use-after-free Date: Tue, 25 Jul 2017 12:19:12 -0700 Message-Id: <20170725192016.331366693@linuxfoundation.org> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725192014.314851996@linuxfoundation.org> References: <20170725192014.314851996@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bart Van Assche commit 9f4ab18ac51dc87345a9cbd2527e6acf7a0a9335 upstream. scsiback_release_cmd() must not dereference se_cmd->se_tmr_req because that memory is freed by target_free_cmd_mem() before scsiback_release_cmd() is called. Fix this use-after-free by inlining struct scsiback_tmr into struct vscsibk_pend. Signed-off-by: Bart Van Assche Reviewed-by: Juergen Gross Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: David Disseldorp Cc: xen-devel@lists.xenproject.org Signed-off-by: Nicholas Bellinger Signed-off-by: Greg Kroah-Hartman --- drivers/xen/xen-scsiback.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -134,9 +134,7 @@ struct vscsibk_pend { struct page *pages[VSCSI_MAX_GRANTS]; struct se_cmd se_cmd; -}; -struct scsiback_tmr { atomic_t tmr_complete; wait_queue_head_t tmr_wait; }; @@ -599,26 +597,20 @@ static void scsiback_device_action(struc struct scsiback_tpg *tpg = pending_req->v2p->tpg; struct scsiback_nexus *nexus = tpg->tpg_nexus; struct se_cmd *se_cmd = &pending_req->se_cmd; - struct scsiback_tmr *tmr; u64 unpacked_lun = pending_req->v2p->lun; int rc, err = FAILED; - tmr = kzalloc(sizeof(struct scsiback_tmr), GFP_KERNEL); - if (!tmr) { - target_put_sess_cmd(se_cmd); - goto err; - } - - init_waitqueue_head(&tmr->tmr_wait); + init_waitqueue_head(&pending_req->tmr_wait); rc = target_submit_tmr(&pending_req->se_cmd, nexus->tvn_se_sess, &pending_req->sense_buffer[0], - unpacked_lun, tmr, act, GFP_KERNEL, + unpacked_lun, NULL, act, GFP_KERNEL, tag, TARGET_SCF_ACK_KREF); if (rc) goto err; - wait_event(tmr->tmr_wait, atomic_read(&tmr->tmr_complete)); + wait_event(pending_req->tmr_wait, + atomic_read(&pending_req->tmr_complete)); err = (se_cmd->se_tmr_req->response == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED; @@ -626,9 +618,8 @@ static void scsiback_device_action(struc scsiback_do_resp_with_sense(NULL, err, 0, pending_req); transport_generic_free_cmd(&pending_req->se_cmd, 1); return; + err: - if (tmr) - kfree(tmr); scsiback_do_resp_with_sense(NULL, err, 0, pending_req); } @@ -1389,12 +1380,6 @@ static int scsiback_check_stop_free(stru static void scsiback_release_cmd(struct se_cmd *se_cmd) { struct se_session *se_sess = se_cmd->se_sess; - struct se_tmr_req *se_tmr = se_cmd->se_tmr_req; - - if (se_tmr && se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB) { - struct scsiback_tmr *tmr = se_tmr->fabric_tmr_ptr; - kfree(tmr); - } percpu_ida_free(&se_sess->sess_tag_pool, se_cmd->map_tag); } @@ -1455,11 +1440,11 @@ static int scsiback_queue_status(struct static void scsiback_queue_tm_rsp(struct se_cmd *se_cmd) { - struct se_tmr_req *se_tmr = se_cmd->se_tmr_req; - struct scsiback_tmr *tmr = se_tmr->fabric_tmr_ptr; + struct vscsibk_pend *pending_req = container_of(se_cmd, + struct vscsibk_pend, se_cmd); - atomic_set(&tmr->tmr_complete, 1); - wake_up(&tmr->tmr_wait); + atomic_set(&pending_req->tmr_complete, 1); + wake_up(&pending_req->tmr_wait); } static void scsiback_aborted_task(struct se_cmd *se_cmd) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.9 037/125] xen/scsiback: Fix a TMR related use-after-free Date: Tue, 25 Jul 2017 12:19:12 -0700 Message-ID: <20170725192016.331366693@linuxfoundation.org> References: <20170725192014.314851996@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1da5OP-0004Y2-1J for xen-devel@lists.xenproject.org; Tue, 25 Jul 2017 19:21:17 +0000 In-Reply-To: <20170725192014.314851996@linuxfoundation.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org Cc: Juergen Gross , Hannes Reinecke , xen-devel@lists.xenproject.org, Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Bellinger , David Disseldorp , Bart Van Assche , Christoph Hellwig List-Id: xen-devel@lists.xenproject.org NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IEJhcnQgVmFuIEFz c2NoZSA8YmFydC52YW5hc3NjaGVAc2FuZGlzay5jb20+Cgpjb21taXQgOWY0YWIxOGFjNTFkYzg3 MzQ1YTljYmQyNTI3ZTZhY2Y3YTBhOTMzNSB1cHN0cmVhbS4KCnNjc2liYWNrX3JlbGVhc2VfY21k KCkgbXVzdCBub3QgZGVyZWZlcmVuY2Ugc2VfY21kLT5zZV90bXJfcmVxCmJlY2F1c2UgdGhhdCBt ZW1vcnkgaXMgZnJlZWQgYnkgdGFyZ2V0X2ZyZWVfY21kX21lbSgpIGJlZm9yZQpzY3NpYmFja19y ZWxlYXNlX2NtZCgpIGlzIGNhbGxlZC4gRml4IHRoaXMgdXNlLWFmdGVyLWZyZWUgYnkKaW5saW5p bmcgc3RydWN0IHNjc2liYWNrX3RtciBpbnRvIHN0cnVjdCB2c2NzaWJrX3BlbmQuCgpTaWduZWQt b2ZmLWJ5OiBCYXJ0IFZhbiBBc3NjaGUgPGJhcnQudmFuYXNzY2hlQHNhbmRpc2suY29tPgpSZXZp ZXdlZC1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgpDYzogQ2hyaXN0b3BoIEhl bGx3aWcgPGhjaEBsc3QuZGU+CkNjOiBIYW5uZXMgUmVpbmVja2UgPGhhcmVAc3VzZS5jb20+CkNj OiBEYXZpZCBEaXNzZWxkb3JwIDxkZGlzc0BzdXNlLmRlPgpDYzogeGVuLWRldmVsQGxpc3RzLnhl bnByb2plY3Qub3JnClNpZ25lZC1vZmYtYnk6IE5pY2hvbGFzIEJlbGxpbmdlciA8bmFiQGxpbnV4 LWlzY3NpLm9yZz4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGlu dXhmb3VuZGF0aW9uLm9yZz4KCi0tLQogZHJpdmVycy94ZW4veGVuLXNjc2liYWNrLmMgfCAgIDMz ICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5z ZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgotLS0gYS9kcml2ZXJzL3hlbi94ZW4tc2NzaWJh Y2suYworKysgYi9kcml2ZXJzL3hlbi94ZW4tc2NzaWJhY2suYwpAQCAtMTM0LDkgKzEzNCw3IEBA IHN0cnVjdCB2c2NzaWJrX3BlbmQgewogCXN0cnVjdCBwYWdlICpwYWdlc1tWU0NTSV9NQVhfR1JB TlRTXTsKIAogCXN0cnVjdCBzZV9jbWQgc2VfY21kOwotfTsKIAotc3RydWN0IHNjc2liYWNrX3Rt ciB7CiAJYXRvbWljX3QgdG1yX2NvbXBsZXRlOwogCXdhaXRfcXVldWVfaGVhZF90IHRtcl93YWl0 OwogfTsKQEAgLTU5OSwyNiArNTk3LDIwIEBAIHN0YXRpYyB2b2lkIHNjc2liYWNrX2RldmljZV9h Y3Rpb24oc3RydWMKIAlzdHJ1Y3Qgc2NzaWJhY2tfdHBnICp0cGcgPSBwZW5kaW5nX3JlcS0+djJw LT50cGc7CiAJc3RydWN0IHNjc2liYWNrX25leHVzICpuZXh1cyA9IHRwZy0+dHBnX25leHVzOwog CXN0cnVjdCBzZV9jbWQgKnNlX2NtZCA9ICZwZW5kaW5nX3JlcS0+c2VfY21kOwotCXN0cnVjdCBz Y3NpYmFja190bXIgKnRtcjsKIAl1NjQgdW5wYWNrZWRfbHVuID0gcGVuZGluZ19yZXEtPnYycC0+ bHVuOwogCWludCByYywgZXJyID0gRkFJTEVEOwogCi0JdG1yID0ga3phbGxvYyhzaXplb2Yoc3Ry dWN0IHNjc2liYWNrX3RtciksIEdGUF9LRVJORUwpOwotCWlmICghdG1yKSB7Ci0JCXRhcmdldF9w dXRfc2Vzc19jbWQoc2VfY21kKTsKLQkJZ290byBlcnI7Ci0JfQotCi0JaW5pdF93YWl0cXVldWVf aGVhZCgmdG1yLT50bXJfd2FpdCk7CisJaW5pdF93YWl0cXVldWVfaGVhZCgmcGVuZGluZ19yZXEt PnRtcl93YWl0KTsKIAogCXJjID0gdGFyZ2V0X3N1Ym1pdF90bXIoJnBlbmRpbmdfcmVxLT5zZV9j bWQsIG5leHVzLT50dm5fc2Vfc2VzcywKIAkJCSAgICAgICAmcGVuZGluZ19yZXEtPnNlbnNlX2J1 ZmZlclswXSwKLQkJCSAgICAgICB1bnBhY2tlZF9sdW4sIHRtciwgYWN0LCBHRlBfS0VSTkVMLAor CQkJICAgICAgIHVucGFja2VkX2x1biwgTlVMTCwgYWN0LCBHRlBfS0VSTkVMLAogCQkJICAgICAg IHRhZywgVEFSR0VUX1NDRl9BQ0tfS1JFRik7CiAJaWYgKHJjKQogCQlnb3RvIGVycjsKIAotCXdh aXRfZXZlbnQodG1yLT50bXJfd2FpdCwgYXRvbWljX3JlYWQoJnRtci0+dG1yX2NvbXBsZXRlKSk7 CisJd2FpdF9ldmVudChwZW5kaW5nX3JlcS0+dG1yX3dhaXQsCisJCSAgIGF0b21pY19yZWFkKCZw ZW5kaW5nX3JlcS0+dG1yX2NvbXBsZXRlKSk7CiAKIAllcnIgPSAoc2VfY21kLT5zZV90bXJfcmVx LT5yZXNwb25zZSA9PSBUTVJfRlVOQ1RJT05fQ09NUExFVEUpID8KIAkJU1VDQ0VTUyA6IEZBSUxF RDsKQEAgLTYyNiw5ICs2MTgsOCBAQCBzdGF0aWMgdm9pZCBzY3NpYmFja19kZXZpY2VfYWN0aW9u KHN0cnVjCiAJc2NzaWJhY2tfZG9fcmVzcF93aXRoX3NlbnNlKE5VTEwsIGVyciwgMCwgcGVuZGlu Z19yZXEpOwogCXRyYW5zcG9ydF9nZW5lcmljX2ZyZWVfY21kKCZwZW5kaW5nX3JlcS0+c2VfY21k LCAxKTsKIAlyZXR1cm47CisKIGVycjoKLQlpZiAodG1yKQotCQlrZnJlZSh0bXIpOwogCXNjc2li YWNrX2RvX3Jlc3Bfd2l0aF9zZW5zZShOVUxMLCBlcnIsIDAsIHBlbmRpbmdfcmVxKTsKIH0KIApA QCAtMTM4OSwxMiArMTM4MCw2IEBAIHN0YXRpYyBpbnQgc2NzaWJhY2tfY2hlY2tfc3RvcF9mcmVl KHN0cnUKIHN0YXRpYyB2b2lkIHNjc2liYWNrX3JlbGVhc2VfY21kKHN0cnVjdCBzZV9jbWQgKnNl X2NtZCkKIHsKIAlzdHJ1Y3Qgc2Vfc2Vzc2lvbiAqc2Vfc2VzcyA9IHNlX2NtZC0+c2Vfc2VzczsK LQlzdHJ1Y3Qgc2VfdG1yX3JlcSAqc2VfdG1yID0gc2VfY21kLT5zZV90bXJfcmVxOwotCi0JaWYg KHNlX3RtciAmJiBzZV9jbWQtPnNlX2NtZF9mbGFncyAmIFNDRl9TQ1NJX1RNUl9DREIpIHsKLQkJ c3RydWN0IHNjc2liYWNrX3RtciAqdG1yID0gc2VfdG1yLT5mYWJyaWNfdG1yX3B0cjsKLQkJa2Zy ZWUodG1yKTsKLQl9CiAKIAlwZXJjcHVfaWRhX2ZyZWUoJnNlX3Nlc3MtPnNlc3NfdGFnX3Bvb2ws IHNlX2NtZC0+bWFwX3RhZyk7CiB9CkBAIC0xNDU1LDExICsxNDQwLDExIEBAIHN0YXRpYyBpbnQg c2NzaWJhY2tfcXVldWVfc3RhdHVzKHN0cnVjdAogCiBzdGF0aWMgdm9pZCBzY3NpYmFja19xdWV1 ZV90bV9yc3Aoc3RydWN0IHNlX2NtZCAqc2VfY21kKQogewotCXN0cnVjdCBzZV90bXJfcmVxICpz ZV90bXIgPSBzZV9jbWQtPnNlX3Rtcl9yZXE7Ci0Jc3RydWN0IHNjc2liYWNrX3RtciAqdG1yID0g c2VfdG1yLT5mYWJyaWNfdG1yX3B0cjsKKwlzdHJ1Y3QgdnNjc2lia19wZW5kICpwZW5kaW5nX3Jl cSA9IGNvbnRhaW5lcl9vZihzZV9jbWQsCisJCQkJc3RydWN0IHZzY3NpYmtfcGVuZCwgc2VfY21k KTsKIAotCWF0b21pY19zZXQoJnRtci0+dG1yX2NvbXBsZXRlLCAxKTsKLQl3YWtlX3VwKCZ0bXIt PnRtcl93YWl0KTsKKwlhdG9taWNfc2V0KCZwZW5kaW5nX3JlcS0+dG1yX2NvbXBsZXRlLCAxKTsK Kwl3YWtlX3VwKCZwZW5kaW5nX3JlcS0+dG1yX3dhaXQpOwogfQogCiBzdGF0aWMgdm9pZCBzY3Np YmFja19hYm9ydGVkX3Rhc2soc3RydWN0IHNlX2NtZCAqc2VfY21kKQoKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0 Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK