From patchwork Fri Mar 17 10:09:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 71229 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp261642wrt; Fri, 17 Mar 2023 03:41:29 -0700 (PDT) X-Google-Smtp-Source: AK7set+Il0+zv2c51S5L9cVme3p4HYtrbWJRnVZQ7sPTAg7yJ8JFhUfq9uwJ2sHlF5oui4AbgyuV X-Received: by 2002:a05:6a21:32a2:b0:cd:9bcf:d251 with SMTP id yt34-20020a056a2132a200b000cd9bcfd251mr8374649pzb.0.1679049689111; Fri, 17 Mar 2023 03:41:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679049689; cv=none; d=google.com; s=arc-20160816; b=Eb0hr8YExXZ5of1SQSoN+E0ZO/k3GMDQteZK8qfZa84N0hN92r5Wzw1pjBpTrHNT8S GB9bDebQGGKnvH+gFYSVYhTULC3VDNKGJ19bX1XSQwY4jHO6P4CO+sCl+sU4bf8PdUft 6SRDSVDVR8uSU0uJDPgiqID1tbw3m7chVeoRaXnggVfqlonmDAgfgfS641i/qNQR02RM yRH4hMSIHAUuRQ5R2N5B0O5r7qqEzedtkjXQxtRx0sxXeISl9Da2q8ihfDCJ8Ux3TOWe o9jgMaPF/OhTUOPUTtw5cdvu8rkF1nB8kD3Z3X/ScBwPQi3bN5LKMj0CQnH9G/DBEpwd GFCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=l0+rcXAx9sjzsHZaRBR/f5UUh1q1PCzp0gO21Al0KDQ=; b=Esrdx3YrS3eFmjT/XC9dJ8DipHkTw71zfuDx7lZasbEZFsB8xCLuZi86mqCPpIMG30 vgphRnNvBk4C8E/yTd6sbD0ZqK56pPlTA3tQjDiDgytysHb4d15CTyOJ+p8e7GD+bZG2 dxKAkWeOsbp1ZbxrzJDfCyw8TZdZNUsAQRmhf6jfrF39Gj0QQRSh/tw3GoX3DCn0FPOl ugQbjYyevuAf6DxlbspxVFkE0jAOzxCMNPWTJJyWi88nRFyGg3qgzurB9JUZjJwPaJIU 9IBuVD20fbqj0hbdvSEHv1nEYw2LXKaNEOeOR2nRtoGuNT/qS0j4QdJ7CoYXrCvV0mha Zujg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=HiUf+8ST; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fd21-20020a056a002e9500b00608f52c3f20si2270040pfb.302.2023.03.17.03.41.14; Fri, 17 Mar 2023 03:41:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=HiUf+8ST; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbjCQKKI (ORCPT + 99 others); Fri, 17 Mar 2023 06:10:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbjCQKKF (ORCPT ); Fri, 17 Mar 2023 06:10:05 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.214]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EB2A37617D; Fri, 17 Mar 2023 03:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=l0+rc XAx9sjzsHZaRBR/f5UUh1q1PCzp0gO21Al0KDQ=; b=HiUf+8STawQQEKzZkTu1t MTBzM9liXFBymei0yOAA81kVC5TCd4Mwgenyb45mp9NrCZrvYzW9xEweAO5uq0oy 4EgeI9i+Pqn069gRGjRJ0KEXrJKOfCsTKxIWD9o7XCdTr9vK2g4PFFFSy/OkIPTo oubgC2TflD0m/23Vb9Fk84= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by zwqz-smtp-mta-g4-1 (Coremail) with SMTP id _____wCn4kBzPBRk4VRZAQ--.53619S2; Fri, 17 Mar 2023 18:09:55 +0800 (CST) From: Zheng Wang To: valentina.manea.m@gmail.com Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, hackerzheng666@gmail.com, 1395428693sheep@gmail.com, alex000young@gmail.com, skhan@linuxfoundation.org, Zheng Wang Subject: [PATCH v3] usbip: vudc: Fix use after free bug in vudc_remove due to race condition Date: Fri, 17 Mar 2023 18:09:54 +0800 Message-Id: <20230317100954.2626573-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wCn4kBzPBRk4VRZAQ--.53619S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7tr15Ww17urWkZrW5Cr1kAFb_yoW8ZrW3pF s5WFWxCr1UJFs2vr1xtws0vF1rJanxJryUuFyxK393Zr43A34UXFyDtr1FkFWxAF9rXr4a qr4kXw1ruFyvq3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziOB_8UUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiQhY1U1aEEsmuWwAAsO X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760611206889143440?= X-GMAIL-MSGID: =?utf-8?q?1760611206889143440?= In vudc_probe, it calls init_vudc_hw, which bound &udc->timer with v_timer. When it calls usbip_sockfd_store, it will call v_start_timer to start the timer work. When we call vudc_remove to remove the driver, theremay be a sequence as follows: Fix it by shutdown the timer work before cleanup in vudc_remove. Note that removing a driver is a root-only operation, and should never happen. But the attacker can directly unplug the usb to trigger the remove function. CPU0 CPU1 |v_timer vudc_remove | kfree(udc); | //free shost | |udc->gadget |//use The udc might be removed before v_timer finished, and UAF happens. This bug was found by Codeql static analysis and might by false positive. Fixes: b6a0ca111867 ("usbip: vudc: Add UDC specific ops") Signed-off-by: Zheng Wang --- v3: - fix the issue by adding del_timer_sync in v_stop_timer and invoke it in vudc_remove v2: - add more details about how the bug was found suggested by Shuah --- drivers/usb/usbip/vudc_dev.c | 1 + drivers/usb/usbip/vudc_transfer.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/usb/usbip/vudc_dev.c b/drivers/usb/usbip/vudc_dev.c index 2bc428f2e261..dcbfed30806d 100644 --- a/drivers/usb/usbip/vudc_dev.c +++ b/drivers/usb/usbip/vudc_dev.c @@ -633,6 +633,7 @@ int vudc_remove(struct platform_device *pdev) { struct vudc *udc = platform_get_drvdata(pdev); + v_stop_timer(udc); usb_del_gadget_udc(&udc->gadget); cleanup_vudc_hw(udc); kfree(udc); diff --git a/drivers/usb/usbip/vudc_transfer.c b/drivers/usb/usbip/vudc_transfer.c index 7e801fee33bf..562ea7b6ea2e 100644 --- a/drivers/usb/usbip/vudc_transfer.c +++ b/drivers/usb/usbip/vudc_transfer.c @@ -492,5 +492,7 @@ void v_stop_timer(struct vudc *udc) /* timer itself will take care of stopping */ dev_dbg(&udc->pdev->dev, "timer stop"); + + del_timer_sync(&t->timer); t->state = VUDC_TR_STOPPED; }