From patchwork Sun Jan 15 10:32:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawei Li X-Patchwork-Id: 43830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp679202wrn; Sun, 15 Jan 2023 02:35:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXuqCSzY0LP5Cz/wZtY0NkWNrT4NoAn4B6xpJtenh2TgwrwwgAyJyCX0UGfeK/dF9+xDd+uh X-Received: by 2002:a05:6402:528d:b0:48e:f679:e733 with SMTP id en13-20020a056402528d00b0048ef679e733mr38603714edb.36.1673778943076; Sun, 15 Jan 2023 02:35:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673778943; cv=pass; d=google.com; s=arc-20160816; b=MwdbcM2bZPSAGYUthPdVyzV3UeZxZ/vnS5wPPrhDri/Cnf9gYbH1g3FObEjy+y1QZx PnJeu3jKHryf3jwAEzPA37PRSRY/KYEwrWG6R1H+UP9NfsK1k0fGkcoZxNfglaPkzJWC FlE5Gn6KO+GAcVVbGe1w8FYM9DCkEE8zyk0GiaTl5swyAOOjoY1MCrHqwJMXUfG6tcy+ QeDdQaGG67psq38qpWTZMBne2YjwlrzfG228p7PPbqqKcotR/lvF61TSX42eC0Jshnc6 /dgsoCMyLOttKJPCyozNZfb2tt72B3/Yj4kQfRonztFFTVcOg2Ongrn4xSdPxSv/KaS+ ItPA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sTIGXCvlKOe9Ar9BRp9PW662OZnjc2ADZMiM18JhV9c=; b=oSxEFqMzGZJYsNZob0m6Hujrw1TRP3aisDLotZid/S84g9kKmAdwts8I53jLbLPQQE VgZG8kmnvtUUJ8kGW0x3+3kRUpN9b14wrum/l5rVjJcrhogyUv1NkE0u6du6y+Pq4isF WGcQtqK7Bh8VW6uk1jsARnDwaNJ0FkbnMHvehPwygYK8lZgTZa2OsJGyrqQ0nB+YHdZL O7h/iu1gEDKBakVu4i0OeCe6hpycmhGUBrxd3+Q+Pz1lWxiCJQV3vAQiq1QhrU66Xh/9 T6mvBjUpH+nin72AQgFaf5NgOoGvJ7fsmFUUwZuzNygHjRWYWMlh6jPsl1isd8o893+5 6iyQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@outlook.com header.s=selector1 header.b=iWtLCxWK; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dz8-20020a0564021d4800b0049e150b7e04si797236edb.386.2023.01.15.02.35.17; Sun, 15 Jan 2023 02:35:43 -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=@outlook.com header.s=selector1 header.b=iWtLCxWK; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231206AbjAOKcr (ORCPT + 99 others); Sun, 15 Jan 2023 05:32:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230478AbjAOKcZ (ORCPT ); Sun, 15 Jan 2023 05:32:25 -0500 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01olkn2097.outbound.protection.outlook.com [40.92.98.97]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81C61CDE4; Sun, 15 Jan 2023 02:32:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CGPuEChIgIOsu1A0JppAh4q4MsNXJncr0U+UUNG0vhANtI6tzyOyN1EUmltiHFbMvmFh31MMfkTlz0RmijJlYhdrcv90AVP4f8xA59WuFjLQwJaLWlwo+0ljsSOwWcZe9k2wRVo+YPLaPrDljh4IVBKoZofr57z2G+0SFHN4gQezz0Md/6EUU+soWX0DmK6auI1tgPAoApSOq6tdPKGtsEoWXJnIpuxZ63FLLFAMP89vOjIC/bnc+K0222zpt0lEz8umywRasolJEOE/o2Ws6QxWKlpEnkyHoGSpC4Y6ApxIUuhZYaiBXJj6J46eWkUPIpcpMKxSI3kAN1MgOYYiBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sTIGXCvlKOe9Ar9BRp9PW662OZnjc2ADZMiM18JhV9c=; b=VlKuLk0NFlFTW58tTaNyopu1EP81cF0kJaVnjjqLA8h+ymgidRuM58BfMY/s61YVhcXlwRgWPyAvHYYtyey3NDIu+bunukSzfdwAN871p0luRKf5pS3HA7ULgm59I1OpN36t6YlSzEOiSc0k9gltK38u0mYaiz4awiW1RQCMHHVgUwCkfByTu8M6BgCSyJg3ClEljt4w6TYO9WKh1zO/FYM0vfXP4wj2Vrx7oRXDBGG7f8WuJP7e7D0m/F26lxA2flXe3ZCDkKFd7ws/XvCm+PjezhuTPBFPrjTPRiSDgHHK3NS0ZGMcZ/3B0M4bF3S+zhYsu5UzWv36brAk+qPIBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sTIGXCvlKOe9Ar9BRp9PW662OZnjc2ADZMiM18JhV9c=; b=iWtLCxWKk0RB80/OY6xvlj0YrPqxGNb4CBB3Xw2iAF2h4Bul8T2mCtK6Y9eSOTryL15Ckc0yA4TAIRjXO2OWtA+CwZcoZIMbxfP+h3qFh19L/BeOsuGXyIgsB8/gagnBzeIK9zGkGZFEg/ILFxkKKWCVFq+6bZJth3WuqrISP/M5Y1N00T1MEdvRGMzff00CpYfrrqaww30k6fxAmyh2Gg9aROEoMIdyW79haJLwQGA3NpX4VYLxv8BN5azPoLgq19LRhJmqYkz1lBJKQA0z9Nlw3ZAjmwT/6EGxZVyOstRzKWk8syg9zsvSF1zhFW9s1NH6HhqsTyAisMswJQyirA== Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) by OS3P286MB2025.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:1a0::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Sun, 15 Jan 2023 10:32:22 +0000 Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605]) by TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605%4]) with mapi id 15.20.6002.012; Sun, 15 Jan 2023 10:32:22 +0000 From: Dawei Li To: linkinjeon@kernel.org, sfrench@samba.org Cc: senozhatsky@chromium.org, tom@talpey.com, hyc.lee@gmail.com, linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] ksmbd: Remove duplicated codes Date: Sun, 15 Jan 2023 18:32:07 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230115103209.146002-1-set_pte_at@outlook.com> References: <20230115103209.146002-1-set_pte_at@outlook.com> X-TMN: [jzePy8Ke2U269eFgH6xnfJaRWrsiHvp+UnjAOdp2zZY=] X-ClientProxiedBy: TYAPR01CA0210.jpnprd01.prod.outlook.com (2603:1096:404:29::30) To TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) X-Microsoft-Original-Message-ID: <20230115103209.146002-5-set_pte_at@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCP286MB2323:EE_|OS3P286MB2025:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cf5694e-7be6-42aa-7f8d-08daf6e3c98b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NH503JeqDN27RdbYT32y4CUPrkl4oFh2iLiET9ymAjPK+wSrMyyY2KnYlv4HCd/1rWRNU0WkwZ6/lSRQFzD0Q2XpgIcRC+UTu5kRM1OnfSdHGDhi5+thWHYQPFQ+NehZppDsGIek+sz8tm5YGG3zg5WGKF9czBX/kRoQ8IknyKgpqMLgGUHTdOl2a2zjZ4ET4foj6f2t92kPALpAIOgPKMsvje5MPX5UuYqz+Em4IU0OFzj9+VbdpN07MncpUg/IoI/fWB+jmvHJWRZlTvsq8kt0Ro4BHzA7pD5NC0VsJFmqBWGlX+CQKinccWhvJJcpmaWHN9FHDwcRK13NSrDgk8pCMNsCMwvEyVITvAL+yg+hb3WyvHLUon8wSsRQuZAkIr1mfCLFaAgr0EWI74CtlEyuWxY10LMwxdhFWDanUYn2kOFmiZq1WoGJdK8Y/iXvGL5J0qW2QER74csAZnII42CWC2lzixt0g/mmRn6HIJNv24KK75F98cwqCHDe/D/mffkCxMvhxYKYyY/ZUbLwXUEabPNhDv+CLJkHQVt7FBGMhI8flYak8Mr+SCY750bXrfjvCi4+lIIjQ7UN46+6Ci9YBJEHefkZ9FGKsE0QhGw= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EptRm/ylxG1AzPhVnMfV3Xl4pHxAYbi8F2rrFy8U11FQu5vCTUK2Lgt9NTqpGXveJ3PBZKLdY+T9q5kUwThqLiOy2yvCk3B6nRdTbIGFKkEx7FCoutoB6anfF1MkrxBFsSrG9OlPpR4vN3XZV1phh05xP8ZJaJ/hstDzaxv44Z26gPgFSDAJ4pWW+jcYMoOG05MBiKZUc3hTaAx6d4Y28NsA+YbPocovyVb8CPgW5IkSySRiK1Cb8j5aXOi7ulN5ClR0zGsvorBnP6dyo2XKDZwEksSq32MP9WEKDY3geKJ8AlVSRDQK39A+NTAT/+2EWqakm2IuPpDv+9yt4Fw1LNEu25xE6r0DPIimw0t9JrtBGDeLwRViL4ahN0tttxZyRdSwXkGYxYmPGc5KoAFhIaS6Sx5kD/T5tdLqSt4YZeG4ro4j0cZwt7ue3gF08KBKjj5hka2Z25KFQ+s6ISUknLuoxqKpmYo6kx/88kOCMeMFS1hEG2dyoazUr8+QPayN1IqQ7zOHoi/pDbzDNm74q2xdK/tSFd1/zfTvqDSddKNqpGJgsyVB0m1AS2vqz2f25mvPUuZmw9WQhBEL0EIELOw4Dp/og9qp+Fh/oM/pgp0Mu0b8aZrdT61I1MCDQDyfohjK820gMwuWG4wEkoYbvPpmW+a25oMX8KRO2jzmlXtwOdtp4lZJMafVB8tV5zWs+P6OUYlFB2cJ8axTinmvshUJkTqXwPbLhx5VFnP+L9M1KDYNCsgoMvVIMnNkEoshdf0IBWV0Q5mkJrIAgR1U63eDh0JDfZba8hZgt0IWdt2AS2LyR8Lan/y2UnoB+AtP/Q4IWbj8/AKVILwg6q5XijbILBcJoMYNFcZoxKjNk6O98biw5+51JFvCy9WqNIWQG+r99U1Xv9FuSSG84Da0XSncWdv2HSUqnd6YPjHMrsBHNLVOO4D9ybP+nPw1zW1/XK/hB2KhtLnU4/DOaW5bqJOZO3ETcwPfcsRc1rgrmYTIEZPi634EAXoULCaFy6BNI+yUdxvG+wEwj8ChBw9EnjzMW4UNO4X6lkxK8ceLLemI+FBQXXCy7bc+8apUL2LCB8Uls/Z1hITMRiw5+vz4BNiChagjTsM8SJgZHrdbYF3iMx7Blg5+LE5TOplFi38BG0CQPb4Aassqde9OpUROv78PhgCYFk6/hou94Zal0/pQmmAlynWDppe4iaxdhe7P4uvZlrf9UXspdz+H50eHM/M3qnFhx9taG+CNPDksCxFblUymvv7mVuKT8idrSMd9yt9hF5pgEqzCQbCG6nX5/otI+2IghN6NbUTtEiE9urc= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cf5694e-7be6-42aa-7f8d-08daf6e3c98b X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2023 10:32:22.8061 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3P286MB2025 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755084429425049027?= X-GMAIL-MSGID: =?utf-8?q?1755084429425049027?= ksmbd_neg_token_init_mech_token() and ksmbd_neg_token_targ_resp_token() share same implementation, unify them. Signed-off-by: Dawei Li --- fs/ksmbd/asn1.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/fs/ksmbd/asn1.c b/fs/ksmbd/asn1.c index c03eba090368..c85e74fa78e5 100644 --- a/fs/ksmbd/asn1.c +++ b/fs/ksmbd/asn1.c @@ -208,7 +208,7 @@ int ksmbd_neg_token_init_mech_type(void *context, size_t hdrlen, return 0; } -int ksmbd_neg_token_init_mech_token(void *context, size_t hdrlen, +static int ksmbd_neg_token_alloc(void *context, size_t hdrlen, unsigned char tag, const void *value, size_t vlen) { @@ -223,17 +223,16 @@ int ksmbd_neg_token_init_mech_token(void *context, size_t hdrlen, return 0; } -int ksmbd_neg_token_targ_resp_token(void *context, size_t hdrlen, +int ksmbd_neg_token_init_mech_token(void *context, size_t hdrlen, unsigned char tag, const void *value, size_t vlen) { - struct ksmbd_conn *conn = context; - - conn->mechToken = kmalloc(vlen + 1, GFP_KERNEL); - if (!conn->mechToken) - return -ENOMEM; + return ksmbd_neg_token_alloc(context, hdrlen, tag, value, vlen); +} - memcpy(conn->mechToken, value, vlen); - conn->mechToken[vlen] = '\0'; - return 0; +int ksmbd_neg_token_targ_resp_token(void *context, size_t hdrlen, + unsigned char tag, const void *value, + size_t vlen) +{ + return ksmbd_neg_token_alloc(context, hdrlen, tag, value, vlen); }