Message ID | 20221013175144.715255137@linuxfoundation.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp404000wrs; Thu, 13 Oct 2022 10:54:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4LHfBBnEpMThaFrWfBOHVl/xMJBVntu0uCqFOTOXOTy/qKtSnXOAuro1q0/AFOWrAkCVqb X-Received: by 2002:a17:902:f706:b0:184:7a4c:fdd0 with SMTP id h6-20020a170902f70600b001847a4cfdd0mr1155085plo.98.1665683653635; Thu, 13 Oct 2022 10:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683653; cv=none; d=google.com; s=arc-20160816; b=aaJ3m5iNocSe4s5z0aD1/Qj0iB1qf1vcNUC1mljbcym6LeS4GnLt4IaENros5TrQR9 SZM2Ha9JhLpIjt1jgo6CXIlr5DqF1uAhZNzztunq8wtZFZpSB/Jar44JnDNIfYDgIA0T kNwe336O0tXWwrMeHEmUG6il0q2FStRet4pJayExid9Ss22+5JyqFua/9SzMC7wv0uZl 4s9JObZaM8M37b041na4yhBMMbm3UfV0PCz1FuN5QrD/XZr6nUpqOpDT4c7ozpNTxj5l fqxosaQdktD71TgHGKE04qvOF6tKO9xL69k7P5vSIsIXdGll3GIMaB88+3CBNUrmghec c9JA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/99HhorlSEtRK1O8lF2dwiBzQkiIMdwAYwHSdrKnUc4=; b=xUvHP51NlGZ50tbAX6Qhem3bQRLsY3Tmwquu1bZM4/JSvAwFzMtWTfW7FcZ7eCE1Z4 rOuIcCZ2/3Mf0DqZpzZrA8IUvmP4zHuQ9CBZuXdGb32PlLa8oWPzPrTh0ljG4ITRXo2Q 0+hZifultCAtMVGCnVUaUgyk6f/HF0kCItoQvksaF7ypHKpDJ7H4pvLe/JPZggsk7NpL AeTWgl2IlMIawzs6gqIvFawSU6J3TWhKFWy58AlMSBz3IUVoFX/lTTOsswLaXmeloLrV eFUUfKdJ8hN6kdiSlBj/E8jbZlK/KLmoovxzk8QvBB6XMscWp7kj+I6OxAkRqwPWHHDQ mBcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FNZxgvDJ; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p3-20020a1709028a8300b0017a013a0b67si288638plo.453.2022.10.13.10.54.01; Thu, 13 Oct 2022 10:54:13 -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=@linuxfoundation.org header.s=korg header.b=FNZxgvDJ; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229761AbiJMRw6 (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Thu, 13 Oct 2022 13:52:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229693AbiJMRwx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 13 Oct 2022 13:52:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EED7B14FD2D; Thu, 13 Oct 2022 10:52:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7633C618F7; Thu, 13 Oct 2022 17:52:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EC6EC433D6; Thu, 13 Oct 2022 17:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683570; bh=xxDHkhWXn9LWoUKnTOuFYR63Zphxmul0hUMh47XisPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FNZxgvDJSbVmp7S973wGc2l1ts/ixGzyL24z9QwwTW5kbnNqdX9SGCi2SpVKPUtsD Nc+k+XY34RfX6wlUygens3k0XqDIXSHnd+ZaEKbYo4Jo3fK+uP0WDh94qk5MicNcqU RpTXo+I189QZH1rI+UouwDOYvkIdV30Y7EIVHH/A= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "Dmitry Vyukov" <dvyukov@google.com>, stable <stable@kernel.org>, syzbot+23f57c5ae902429285d7@syzkaller.appspotmail.com, Tadeusz Struk <tadeusz.struk@linaro.org>, PaX Team <pageexec@freemail.hu> Subject: [PATCH 5.4 13/38] usb: mon: make mmapped memory read only Date: Thu, 13 Oct 2022 19:52:14 +0200 Message-Id: <20221013175144.715255137@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175144.245431424@linuxfoundation.org> References: <20221013175144.245431424@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746595902396333107?= X-GMAIL-MSGID: =?utf-8?q?1746595902396333107?= |
Series |
None
|
|
Commit Message
Greg KH
Oct. 13, 2022, 5:52 p.m. UTC
From: Tadeusz Struk <tadeusz.struk@linaro.org> commit a659daf63d16aa883be42f3f34ff84235c302198 upstream. Syzbot found an issue in usbmon module, where the user space client can corrupt the monitor's internal memory, causing the usbmon module to crash the kernel with segfault, UAF, etc. The reproducer mmaps the /dev/usbmon memory to user space, and overwrites it with arbitrary data, which causes all kinds of issues. Return an -EPERM error from mon_bin_mmap() if the flag VM_WRTIE is set. Also clear VM_MAYWRITE to make it impossible to change it to writable later. Cc: "Dmitry Vyukov" <dvyukov@google.com> Cc: stable <stable@kernel.org> Fixes: 6f23ee1fefdc ("USB: add binary API to usbmon") Suggested-by: PaX Team <pageexec@freemail.hu> # for the VM_MAYRITE portion Link: https://syzkaller.appspot.com/bug?id=2eb1f35d6525fa4a74d75b4244971e5b1411c95a Reported-by: syzbot+23f57c5ae902429285d7@syzkaller.appspotmail.com Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org> Link: https://lore.kernel.org/r/20220919215957.205681-1-tadeusz.struk@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/usb/mon/mon_bin.c | 5 +++++ 1 file changed, 5 insertions(+)
--- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c @@ -1268,6 +1268,11 @@ static int mon_bin_mmap(struct file *fil { /* don't do anything here: "fault" will set up page table entries */ vma->vm_ops = &mon_bin_vm_ops; + + if (vma->vm_flags & VM_WRITE) + return -EPERM; + + vma->vm_flags &= ~VM_MAYWRITE; vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; vma->vm_private_data = filp->private_data; mon_bin_vma_open(vma);