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 0956EEB64DA for ; Thu, 20 Jul 2023 13:25:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231865AbjGTNZy (ORCPT ); Thu, 20 Jul 2023 09:25:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231864AbjGTNZw (ORCPT ); Thu, 20 Jul 2023 09:25:52 -0400 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83E8719B5 for ; Thu, 20 Jul 2023 06:25:51 -0700 (PDT) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1b9ecf0cb4cso4816095ad.2 for ; Thu, 20 Jul 2023 06:25:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689859551; x=1690464351; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=COPG93mev8fMqXjLdSouxJrO2GsfWHyb7XgSFZkDMBU=; b=Bt66kIZYx7os6s3xE2oZ+qlLBfBo25pANpwMooJA8vShGPoQPvuj87CmLfjteODO1b QpkO7KJtTJQ2s1oSzvMizrZ/7AvLyb4N0SqnO3XEapIErkuwTYhFKe2W5D9T1ldA0V6g J3+JwJsTjOUaw3UAXl3s8Vdu/wYBzgSrW9d3SCCSX11rjiwugQoYvloBWaLnscVj4fnK g256UHHC1fY+m59RyqzdI8GkIYbLVKCP7ZBf6eWEZ8EnVXiGl/Y+hSDJjDk8SZ2hJ4vn QBU/2GAsN24f1m5VmX3e3ofyMxKKTAJtVQozRzoshT7ZJSZFcYtd8Wx7R29KImfIC050 uiNQ== X-Gm-Message-State: ABy/qLZY7AQq/Kcp52VRAFX+j/Eh+KGmSv+bYndu21TKQBSrfvx0fg2n qDR6ABrsr72hxvR0efvzJf65jMh/2ss= X-Google-Smtp-Source: APBJJlHaZ+H4DvuzA0bs99urzvOgFTrmqzwjWqjnUhxVVKyZW34cNblsQ6T2UtnCZBhvwfOLVFuE9A== X-Received: by 2002:a17:903:32c9:b0:1ae:50cc:455 with SMTP id i9-20020a17090332c900b001ae50cc0455mr5483359plr.39.1689859550824; Thu, 20 Jul 2023 06:25:50 -0700 (PDT) Received: from localhost.localdomain ([211.49.23.9]) by smtp.gmail.com with ESMTPSA id jg19-20020a17090326d300b001b9bebb7a9dsm1336039plb.90.2023.07.20.06.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 06:25:50 -0700 (PDT) From: Namjae Jeon To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, stfrench@microsoft.com, smfrench@gmail.com, Namjae Jeon , Ralph Boehme , Tom Talpey , Ronnie Sahlberg , Hyunchul Lee Subject: [5.15.y PATCH 1/4] ksmbd: use ksmbd_req_buf_next() in ksmbd_smb2_check_message() Date: Thu, 20 Jul 2023 22:23:33 +0900 Message-Id: <20230720132336.7614-7-linkinjeon@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230720132336.7614-1-linkinjeon@kernel.org> References: <20230720132336.7614-1-linkinjeon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ralph Boehme commit b83b27909e74d27796de19c802fbc3b65ab4ba9a upstream. Use ksmbd_req_buf_next() in ksmbd_smb2_check_message(). Cc: Tom Talpey Cc: Ronnie Sahlberg Cc: Steve French Cc: Hyunchul Lee Acked-by: Namjae Jeon Signed-off-by: Ralph Boehme Signed-off-by: Steve French --- fs/ksmbd/smb2misc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/ksmbd/smb2misc.c b/fs/ksmbd/smb2misc.c index 33a927df64f1..abc18af14f04 100644 --- a/fs/ksmbd/smb2misc.c +++ b/fs/ksmbd/smb2misc.c @@ -347,16 +347,11 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn, int ksmbd_smb2_check_message(struct ksmbd_work *work) { - struct smb2_pdu *pdu = work->request_buf; + struct smb2_pdu *pdu = ksmbd_req_buf_next(work); struct smb2_hdr *hdr = &pdu->hdr; int command; __u32 clc_len; /* calculated length */ - __u32 len = get_rfc1002_len(pdu); - - if (work->next_smb2_rcv_hdr_off) { - pdu = ksmbd_req_buf_next(work); - hdr = &pdu->hdr; - } + __u32 len = get_rfc1002_len(work->request_buf); if (le32_to_cpu(hdr->NextCommand) > 0) len = le32_to_cpu(hdr->NextCommand); -- 2.25.1