From mboxrd@z Thu Jan 1 00:00:00 1970 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 C1707C4332F for ; Tue, 22 Nov 2022 20:08:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234302AbiKVUId (ORCPT ); Tue, 22 Nov 2022 15:08:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232544AbiKVUIb (ORCPT ); Tue, 22 Nov 2022 15:08:31 -0500 X-Greylist: delayed 2102 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 22 Nov 2022 12:08:29 PST Received: from lizzy.crudebyte.com (lizzy.crudebyte.com [91.194.90.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 315E060689 for ; Tue, 22 Nov 2022 12:08:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=lizzy; h=Cc:To:Subject:Date:From:References:In-Reply-To: Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Content-ID: Content-Description; bh=RO9sw++pfIwBQdkuVrGjUBNV/KCLhBvtU55dRc8P7k8=; b=SEDZw uJPp3QAdKV2/6R69RAmA2HRkixKOkz0+jR19ECNUXvqsSL6i2E3aamX7XldA0sdG46uR2X5/ehEdV eZoeBcw145ak0lHUN9vdkr0oB5QkX4p8D7oRju6wZUzxBN6IBxbJ6CQ6gZ48uHwEBPCIz8djTg/eT ELv1xOnFQ3GYraTqq9xrSu0gh/R9NSCK6kSbP/rDdQMKQ3gVg96O9EKv98wD2ZMflzzkTOwMBBCpB kx7pPsWvXKnTgNTXMzwM3paxurtqMkJdEtLQ5Z7368M2rpuxNyCCKT2qkj2R4DTy2rc2POpetL+O+ 8S1+NAtLQ45UHlmK2taD/jO2NWV3Q==; Message-Id: In-Reply-To: References: From: Christian Schoenebeck Date: Tue, 22 Nov 2022 20:20:29 +0100 Subject: [PATCH v2 2/2] net/9p: fix response size check in p9_check_errors() To: Dominique Martinet , Stefano Stabellini Cc: v9fs-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, GUO Zihua Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 60ece0833b6c ("net/9p: allocate appropriate reduced message buffers") it is no longer appropriate to check server's response size against msize. Check against the previously allocated buffer capacity instead. - Omit this size check entirely for zero-copy messages, as those always allocate 4k (P9_ZC_HDR_SZ) linear buffers which are not used for actual payload and can be much bigger than 4k. - Replace p9_debug() by pr_err() to make sure this message is always printed in case this error is triggered. - Add 9p message type to error message to ease investigation. Signed-off-by: Christian Schoenebeck Tested-by: Stefano Stabellini Reported-by: kernel test robot --- net/9p/client.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/9p/client.c b/net/9p/client.c index c7935e392812..0ff25c2157ab 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -514,10 +514,9 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req) int ecode; err = p9_parse_header(&req->rc, NULL, &type, NULL, 0); - if (req->rc.size >= c->msize) { - p9_debug(P9_DEBUG_ERROR, - "requested packet size too big: %d\n", - req->rc.size); + if (req->rc.size > req->rc.capacity && !req->rc.zc) { + pr_err("requested packet size too big: %d does not fit %zu (type=%d)\n", + req->rc.size, req->rc.capacity, req->rc.id); return -EIO; } /* dump the response from server -- 2.30.2