From patchwork Wed Nov 23 05:15:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 24709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2605108wrr; Tue, 22 Nov 2022 21:32:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf71O+4yS+jaVAzZkkRU1Ob6CRGTZHAi6hAczJKaU+j87eGp3YWZoxz5pOoF62iI7y/VPfzc X-Received: by 2002:a17:906:b794:b0:7ae:6450:c620 with SMTP id dt20-20020a170906b79400b007ae6450c620mr6074347ejb.270.1669181523141; Tue, 22 Nov 2022 21:32:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669181523; cv=none; d=google.com; s=arc-20160816; b=h7m53jh3MzzEjOzZpvz0OhPsganFT/Pcn1mU2k/xcdjkUicmMNorF0bTUM3I6goARB thG/yu84iNCC/jhpTkmQJsYFacHQtUTnNJWfEdsWDLgn/guzgAzgr+eiAZylVnAIBKnF PGWtoWuHC4M3+Gx22fr7AUkzAlt3Ewrle5NnQk6bLzSXx+1raYSZuquDT7cfDS05x5am EpFkpNnM9evtNQWKauHSdxEG4Rqe4cuD7wYaXioHMkoa/7E8/JmDQi9nW3gLgOuYTQnr sDvR/JPOfit94/4xktJy6nHaU2vmydJHgtbFlK/Gzy5KaBH+Py3/aPGtYzRMwt9s3DcH jJQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=iPT0LtABgClIL1IGlsba5+6joAsD3/Hw7Ap3XlgNN6I=; b=EClRazaGvP9hD4c0gDZM9EPzv4tefHalR162cYeopcl4Y/DmngGy3sWB87cYYiUpyd 1zDwADFk86E1fAJHjj6bZCCg7R6w5eWYpsSYZCPX9hIp8066hYoBwn42H6/Q+KG1+6Pv X9vkSFTUt02UgW96SeBBclUTXrsoztxhfYiJR0bhew6WxCAAmFQ3lT1hjezsHEqcVuG0 wUC7EfHquYCQ1f+zPOIlWzWfllQ+j5b1QZ9mf2IVhgzGqbu02LiHQbNzNf0evQTtaPqi 9bPAcCbjum2Cks4mLznSR1S5oacZQeOBU4vZICJaRKk6WS9dwUE7J3RWA2HndOE4xSVh NSzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codewreck.org header.s=2 header.b=a7xbnafB; dkim=pass header.i=@codewreck.org header.s=2 header.b=KTas6Day; 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=codewreck.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l23-20020a170906415700b007a20c586f4esi10712882ejk.876.2022.11.22.21.31.37; Tue, 22 Nov 2022 21:32:03 -0800 (PST) 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=@codewreck.org header.s=2 header.b=a7xbnafB; dkim=pass header.i=@codewreck.org header.s=2 header.b=KTas6Day; 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=codewreck.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235751AbiKWFQQ (ORCPT + 99 others); Wed, 23 Nov 2022 00:16:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235745AbiKWFQI (ORCPT ); Wed, 23 Nov 2022 00:16:08 -0500 Received: from nautica.notk.org (ipv6.notk.org [IPv6:2001:41d0:1:7a93::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5878ECCCB; Tue, 22 Nov 2022 21:16:04 -0800 (PST) Received: by nautica.notk.org (Postfix, from userid 108) id 2BF61C01B; Wed, 23 Nov 2022 06:16:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codewreck.org; s=2; t=1669180569; bh=iPT0LtABgClIL1IGlsba5+6joAsD3/Hw7Ap3XlgNN6I=; h=Date:From:To:Cc:Subject:From; b=a7xbnafB3H1BP/6ISBXFHlURChsbJeqtBu9pSVEGJEut2Zyj8IFqiWf3qeS01wbVl eYBu28PDGl65eMTviJ/4ZWumHt40WYugyHTv3WS6oCAVNhPVv6WgGo+NJaLOOeTwuT 4GcCV5GG9Fs/onKszzqYO4D3ApCWgFBtGtrx9lyr8brgApJfJZ9vufpyAVVB8WBm6k 6hSA4VRcdWfteZgeZg9zLsY3JVdPOxU+jlMG5vtws9vBM8KUwO/9OKstLDO2wy+dkm xlBpIlRe/IqpTu/C79ApncdK67tOXMCHxIL1f1/O2fRPRGMM7S7VEAg/g9ene6/9wF eyIyYC3nirXvw== X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from odin.codewreck.org (localhost [127.0.0.1]) by nautica.notk.org (Postfix) with ESMTPS id 1A4CAC009; Wed, 23 Nov 2022 06:16:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codewreck.org; s=2; t=1669180568; bh=iPT0LtABgClIL1IGlsba5+6joAsD3/Hw7Ap3XlgNN6I=; h=Date:From:To:Cc:Subject:From; b=KTas6DayCTmDcJZ+jvY6SnkEXjUxPMtowIElXhAWh0eD1FI3T7NPjLHOooyTD86PZ 6V+yNE7B6DQXPotPoI3tWiMU8dtX4weaThSpfqn1xAmoSN0ni0pPebRpkOBhde9Wc/ A3TfpiPKlkgmvlIyoeafduKBsiG77577wyaYdV2YGy+Em7Hf2nsIo3SmAiP603vzPP 5YIR43jnjwJbmnCy2l58hbEIjd9PguiJwvFFL31IJEf8NoTND5d3rBgFj6x3UyJwAN p8hfUCuNeheNOZgvhsCSR3dTveVDHBpDs84cxJPvOmZNeQ9IBsqXTHmpX+kPW0QC+i ToUSjs7GJy63g== Received: from localhost (odin.codewreck.org [local]) by odin.codewreck.org (OpenSMTPD) with ESMTPA id 315a764d; Wed, 23 Nov 2022 05:15:56 +0000 (UTC) Date: Wed, 23 Nov 2022 14:15:41 +0900 From: Dominique Martinet To: Linus Torvalds Cc: Christian Schoenebeck , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, v9fs-developer@lists.sourceforge.net Subject: [GIT PULL] 9p fixes for 6.1-rc7 Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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?1750263684742165218?= X-GMAIL-MSGID: =?utf-8?q?1750263684742165218?= The following changes since commit f0c4d9fc9cc9462659728d168387191387e903cc: Linux 6.1-rc4 (2022-11-06 15:07:11 -0800) are available in the Git repository at: https://github.com/martinetd/linux tags/9p-for-6.1-rc7 for you to fetch changes up to 391c18cf776eb4569ecda1f7794f360fe0a45a26: 9p/xen: check logical size for buffer size (2022-11-23 14:01:27 +0900) (yes, that's just now -- sorry, I just noticed a whitespace problem as I prepared this mail, there's no code change with what was tested and in -next for a few days) ---------------------------------------------------------------- 9p-for-6.1-rc7 Two fixes: - 9p now uses a variable size for its recv buffer, but every place hadn't been updated properly to use it and some buffer overflows have been found and needed fixing. There's still one place where msize is incorrectly used in a safety check (p9_check_errors), but all paths leading to it should already be avoiding overflows and that patch took a bit more time to get right for zero-copy requests so I'll send it for 6.2 - yet another race condition in p9_conn_cancel introduced by a fix of a syzbot report in the same place, maybe at some point we'll get it right without burning it all down... ---------------------------------------------------------------- Dominique Martinet (1): 9p/xen: check logical size for buffer size GUO Zihua (2): 9p/fd: Fix write overflow in p9_read_work 9p/fd: Use P9_HDRSZ for header size Zhengchao Shao (1): 9p/fd: fix issue of list_del corruption in p9_fd_cancel() net/9p/trans_fd.c | 24 +++++++++++++----------- net/9p/trans_xen.c | 9 +++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) 9 files changed, 254 insertions(+), 28 deletions(-) --- Dominique