Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp668779pxb; Thu, 13 Jan 2022 14:24:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIO83/wJb5jDnCIDdW7/VnLYemSJAGSdBImWejLGiWGpSahwGFawYhvKFCTnRIDYevz4l5 X-Received: by 2002:a63:7406:: with SMTP id p6mr5574273pgc.151.1642112672809; Thu, 13 Jan 2022 14:24:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642112672; cv=none; d=google.com; s=arc-20160816; b=ZuRE0/e8pBbiL5LnmQFJKCi88Xs7vR/DQ896xZXv6rZWv8XMuBWej0iNKlkuWtbnLD sniYWk0zD4+kUFwMjMqq0Gio5xQl3l4qbgQ2a+oiMRndmpis+akcphY41T73SKmeKow5 vS0ak6hvrjfrEyuTvnau+T7WB7lk+YOOFmzcMeX4zgEnj/UU0dwvodPQfADU4FiB/C+6 +wFHHe3H7TGRNTVmntexUot/Du5de+DfuVMeAMRdquRXgTura+N7WAc6bvlIyLyw2aaT zmV0fe6YG7dXZCzQpaLj5A1DGL26SfR9MS07a2sTnGdL1jhEcErg9OvjWcYEA6a1PwZd yK2Q== 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 :message-id:date:subject:cc:to:from; bh=mUbQQh3EivjfrC0tl2uK88oj2QxcbB0qwsKAAJt+nxw=; b=kVw+mMjlO7WZl025MU1qQES5/JLB2uuOvWzKouAFj+OMl4G6lD5Jsv1bMFoSV605eM xuzuYEKpEgf0bkaUkexXho+CNFNcWtp7BGA0gKf9HBRVcCh2RbRWMBcoNEq1yg8O8xck FXRsbo7iOZnJFK0UG4aYeNN5NbQFmUL17OsL3a10g3WYIj6OG7BJMqjTUkW+581kk6PO Gdc0LRTfTFL72iyPXvZfJ9QdsGNlLQ/4tadjPvKaG0st3hy1cOatnlFaaDNO2N0Lo9x7 MP8Ulx5/D4RLXkOz5fcqw09BfqA7FC4/eHaj2+A8ciLzHPxsGF6vvvhebWimPqFPlcRw uTYQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t8si4345528pgu.646.2022.01.13.14.24.08; Thu, 13 Jan 2022 14:24:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235328AbiAMNiM (ORCPT + 99 others); Thu, 13 Jan 2022 08:38:12 -0500 Received: from szxga03-in.huawei.com ([45.249.212.189]:31158 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235344AbiAMNiH (ORCPT ); Thu, 13 Jan 2022 08:38:07 -0500 Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4JZQRB6kfVz8wN3; Thu, 13 Jan 2022 21:35:18 +0800 (CST) Received: from dggpeml500017.china.huawei.com (7.185.36.243) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 13 Jan 2022 21:38:02 +0800 Received: from huawei.com (10.175.103.91) by dggpeml500017.china.huawei.com (7.185.36.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 13 Jan 2022 21:38:02 +0800 From: Yang Yingliang To: , CC: , Subject: [PATCH -next] NFSv4.1 Use kmemdup_nul() helper Date: Thu, 13 Jan 2022 21:43:17 +0800 Message-ID: <20220113134317.3130643-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500017.china.huawei.com (7.185.36.243) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Use kmemdup_nul() helper instead of open-coding to simplify the code. Signed-off-by: Yang Yingliang --- fs/nfs/nfs4proc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index e6b49d6318bc..60fcd98b40a6 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4004,11 +4004,10 @@ static void test_fs_location_for_trunking(struct nfs4_fs_location *location, return; xprt_args.dstaddr = &addr; xprt_args.addrlen = addrlen; - servername = kmalloc(srv_loc->len + 1, GFP_KERNEL); + servername = kmemdup_nul(srv_loc->data, srv_loc->len, + GFP_KERNEL); if (!servername) return; - memcpy(servername, srv_loc->data, srv_loc->len); - servername[srv_loc->len] = '\0'; xprt_args.servername = servername; xprtdata.cred = nfs4_get_clid_cred(clp); -- 2.25.1