From patchwork Sun Feb 19 21:08:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E999D604A0 for ; Sun, 19 Feb 2017 21:08:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA69528708 for ; Sun, 19 Feb 2017 21:08:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF98F2870F; Sun, 19 Feb 2017 21:08:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BB5428708 for ; Sun, 19 Feb 2017 21:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751651AbdBSVIr (ORCPT ); Sun, 19 Feb 2017 16:08:47 -0500 Received: from mail-it0-f67.google.com ([209.85.214.67]:34553 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751780AbdBSVIq (ORCPT ); Sun, 19 Feb 2017 16:08:46 -0500 Received: by mail-it0-f67.google.com with SMTP id r141so8890498ita.1 for ; Sun, 19 Feb 2017 13:08:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BziGN6jHjsWgx/CbRbqRtFSjCILQPMyKNGvvz7zqgNI=; b=rY6ElS03Kj45JuWBeNdE2TPfawa0OL2OIQGfk2AALDceRoZVjyxkXyf/Jc3RzCcH7d 9Ou2e25AkqW/vZOaXbgxBQ0iDYTSwOlmmDcEnu7kJqENK8TtTdVphypr9XO+C899lFPq jMEpXN379H2TsGQxy6A6isB5Oxis8uhKe4pSq5HyUpVAfZONmZtShyG1Pah4DEEmSUur PWhCcAR5XgDdOe2b+Ys/FlpnydhbqzURcgj7kxcueuxB7u/rGW1cLSCoD4eV6BP5MUuS mblXVuFSSJ6OwESqPd9oQ46io+Yeu4yYvJgi7XBSDctYoZQq4hZM6D/mErJvM5i2G7cF tyCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BziGN6jHjsWgx/CbRbqRtFSjCILQPMyKNGvvz7zqgNI=; b=j94nDHGienOsM9WVYt0ZTAnEtTWwjHoqXxAEbwp/Tht9bYsc/GiLP/dUPtMuGr1jIj TP2WKKnwPHzbb6dPNC7tOYqB5HIi1yQd6NV3NAmemgYcWzC6NAqBVriR0czqj15VhKu6 ezvB6wlbkmMdnqftUvCwczyvox7JW3QQSt/aug0eHYMDKipI0uyfZPWH1ugETTm3znfA yfAQ9BAjhhPz59dGCiLG1wIAOvAYLmOqUscG2pbhPBMeL4SiLcpRSFPBOvF4iV5hLvAG g+MWE4A0tcRthnirkSup+Raq+NpcJFiyKaCnNbeJ+YFkLx1R3E/np8SaiGlWuo5qmwQh H9pA== X-Gm-Message-State: AMke39npIIKuvYKoWsYH12fqpOMKdDZSwJoeUFAD5e2EoX3WNQDQaNvmEULoh7TD3n52zg== X-Received: by 10.36.34.201 with SMTP id o192mr7949283ito.17.1487538525547; Sun, 19 Feb 2017 13:08:45 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id g204sm4076485ita.31.2017.02.19.13.08.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 13:08:44 -0800 (PST) From: Trond Myklebust To: Anna Schumaker , Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 7/8] SUNRPC: Add a helper function xdr_stream_decode_string_dup() Date: Sun, 19 Feb 2017 16:08:31 -0500 Message-Id: <20170219210832.61213-8-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170219210832.61213-7-trond.myklebust@primarydata.com> References: <20170219210832.61213-1-trond.myklebust@primarydata.com> <20170219210832.61213-2-trond.myklebust@primarydata.com> <20170219210832.61213-3-trond.myklebust@primarydata.com> <20170219210832.61213-4-trond.myklebust@primarydata.com> <20170219210832.61213-5-trond.myklebust@primarydata.com> <20170219210832.61213-6-trond.myklebust@primarydata.com> <20170219210832.61213-7-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Create a helper function that decodes a xdr string object, allocates a memory buffer and then store it as a NUL terminated string. Signed-off-by: Trond Myklebust Reviewed-by: Chuck Lever --- include/linux/sunrpc/xdr.h | 2 ++ net/sunrpc/xdr.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h index dc7e51a769ac..054c8cde18f3 100644 --- a/include/linux/sunrpc/xdr.h +++ b/include/linux/sunrpc/xdr.h @@ -242,6 +242,8 @@ extern unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len); extern void xdr_enter_page(struct xdr_stream *xdr, unsigned int len); extern int xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, int (*actor)(struct scatterlist *, void *), void *data); +ssize_t xdr_stream_decode_string_dup(struct xdr_stream *xdr, char **str, + size_t maxlen, gfp_t gfp_flags); /** * xdr_align_size - Calculate padded size of an object * @n: Size of an object being XDR encoded (in bytes) diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 7f1071e103ca..1f7082144e01 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -1518,3 +1518,37 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, } EXPORT_SYMBOL_GPL(xdr_process_buf); +/** + * xdr_stream_decode_string_dup - Decode and duplicate variable length string + * @xdr: pointer to xdr_stream + * @str: location to store pointer to string + * @maxlen: maximum acceptable string length + * @gfp_flags: GFP mask to use + * + * Return values: + * On success, returns length of NUL-terminated string stored in *@ptr + * %-EBADMSG on XDR buffer overflow + * %-EMSGSIZE if the size of the string would exceed @maxlen + * %-ENOMEM on memory allocation failure + */ +ssize_t xdr_stream_decode_string_dup(struct xdr_stream *xdr, char **str, + size_t maxlen, gfp_t gfp_flags) +{ + void *p; + ssize_t ret; + + ret = xdr_stream_decode_opaque_inline(xdr, &p, maxlen); + if (ret > 0) { + char *s = kmalloc(ret + 1, gfp_flags); + if (s != NULL) { + memcpy(s, p, ret); + s[ret] = '\0'; + *str = s; + return strlen(s); + } + ret = -ENOMEM; + } + *str = NULL; + return ret; +} +EXPORT_SYMBOL_GPL(xdr_stream_decode_string_dup);