From patchwork Sat Nov 12 03:12:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiantao Zhang X-Patchwork-Id: 13040985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7ADCC433FE for ; Sat, 12 Nov 2022 03:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233915AbiKLDNC (ORCPT ); Fri, 11 Nov 2022 22:13:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbiKLDNA (ORCPT ); Fri, 11 Nov 2022 22:13:00 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 438E96A6AA; Fri, 11 Nov 2022 19:12:56 -0800 (PST) Received: from kwepemi500002.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N8LGY1VrZzHvp6; Sat, 12 Nov 2022 11:12:21 +0800 (CST) Received: from [10.136.108.160] (10.136.108.160) by kwepemi500002.china.huawei.com (7.221.188.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 12 Nov 2022 11:12:47 +0800 Subject: [PATCH v2] USB: gadget: Fix use-after-free during usb config switch References: <20221112030433.4945-1-xuetao09@huawei.com> To: , , , , =?utf-8?b?5byg5bu65rab?= , , =?utf-8?b?6Jab5rab?= , , CC: =?utf-8?b?6JSh5Lqa5Lic?= , =?utf-8?b?5b6Q5rW35rSL?= , From: jiantao zhang X-Forwarded-Message-Id: <20221112030433.4945-1-xuetao09@huawei.com> Message-ID: <27f1534f-a985-06e9-b94f-ba60167e74d2@huawei.com> Date: Sat, 12 Nov 2022 11:12:46 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20221112030433.4945-1-xuetao09@huawei.com> Content-Language: en-US X-Originating-IP: [10.136.108.160] X-ClientProxiedBy: dggpeml100024.china.huawei.com (7.185.36.115) To kwepemi500002.china.huawei.com (7.221.188.171) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org In the process of switching USB config from rndis to other config, if the hardware does not support the ->pullup callback, or the hardware encounters a low probability fault, both of them may cause the ->pullup callback to fail, which will then cause a system panic (use after free). The gadget drivers sometimes need to be unloaded regardless of the hardware's behavior. Analysis as follows: ======================================================================= (1) write /config/usb_gadget/g1/UDC "none" (init.usb.configfs.rc:2) gether_disconnect+0x2c/0x1f8 (dev->port_usb = NULL) rndis_disable+0x4c/0x74 composite_disconnect+0x74/0xb0 configfs_composite_disconnect+0x60/0x7c usb_gadget_disconnect+0x70/0x124 usb_gadget_unregister_driver+0xc8/0x1d8 gadget_dev_desc_UDC_store+0xec/0x1e4 In function usb_gadget_disconnect(),The ->disconnect() callback will not be called when gadget->ops->pullup() return an error, therefore, pointer dev->port will not be set to NULL. If pointer dev->port_usb is not null, it will cause an exception of use-after-free in step3. (2) rm /config/usb_gadget/g1/configs/b.1/f1 (init.usb.configfs.rc:8) (f1 -> ../../../../usb_gadget/g1/functions/rndis.gs4) rndis_deregister+0x28/0x54 (kfree(params)) rndis_free+0x44/0x7c (kfree(rndis)) usb_put_function+0x14/0x1c config_usb_cfg_unlink+0xc4/0xe0 configfs_unlink+0x124/0x1c8 vfs_unlink+0x114/0x1dc (3) rmdir /config/usb_gadget/g1/functions/rndis.gs4 (init.usb.configfs.rc:11) Call trace: panic+0x1fc/0x3d0 die+0x29c/0x2a8 do_page_fault+0xa8/0x46c do_mem_abort+0x3c/0xac el1_sync_handler+0x40/0x78 0xffffff801138f880 (params->resp_avail is an illegal func pointer) rndis_close+0x28/0x34 (->rndis_indicate_status_msg->params->resp_avail) eth_stop+0x74/0x110 (if dev->port_usb != NULL, call rndis_close) __dev_close_many+0x134/0x194 dev_close_many+0x48/0x194 rollback_registered_many+0x118/0x814 unregister_netdevice_queue+0xe0/0x168 unregister_netdev+0x20/0x30 gether_cleanup+0x1c/0x38 rndis_free_inst+0x2c/0x58 rndis_attr_release+0xc/0x14 kref_put+0x74/0xb8 config_item_put+0x14/0x1c configfs_rmdir+0x314/0x374 In step3,function pointer params->resp_avail() is a wild pointer becase pointer params has been freed in step2. Free mem stack(in step2): usb_put_function -> rndis_free -> rndis_deregister -> kfree(params) use-after-free stack(in step3): eth_stop -> rndis_close -> rndis_signal_disconnect -> rndis_indicate_status_msg -> params->resp_avail() In function eth_stop(), if pointer dev->port_usb is NULL, function rndis_close() will not be called. If gadget->ops->pullup() return an error in step1,dev->port_usb will not be set to null. So, a panic will be caused in step3. ======================================================================= Fixes:<0a55187a1ec8c> (USB: gadget core: Issue ->disconnect() callback from usb_gadget_disconnect()) Signed-off-by: Jiantao Zhang Signed-off-by: TaoXue --- V1 -> V2: V1 will affect the original function, V2 just move the callback after "if" statement, so that the original function will not be affected. And fixed formatting issues. drivers/usb/gadget/udc/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) . diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index c63c0c2cf649..bf9878e1a72a 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -734,13 +734,13 @@ int usb_gadget_disconnect(struct usb_gadget *gadget) } ret = gadget->ops->pullup(gadget, 0); - if (!ret) { + if (!ret) gadget->connected = 0; - mutex_lock(&udc_lock); - if (gadget->udc->driver) - gadget->udc->driver->disconnect(gadget); - mutex_unlock(&udc_lock); - } + + mutex_lock(&udc_lock); + if (gadget->udc->driver) + gadget->udc->driver->disconnect(gadget); + mutex_unlock(&udc_lock); out: trace_usb_gadget_disconnect(gadget, ret); -- 2.17.1