From patchwork Mon Jun 20 16:10:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 9188153 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 664536075F for ; Mon, 20 Jun 2016 16:26:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5516F26861 for ; Mon, 20 Jun 2016 16:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A0ED276AE; Mon, 20 Jun 2016 16:26:18 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 F219526861 for ; Mon, 20 Jun 2016 16:26:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755961AbcFTQ0P (ORCPT ); Mon, 20 Jun 2016 12:26:15 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:33551 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755953AbcFTQ0I (ORCPT ); Mon, 20 Jun 2016 12:26:08 -0400 Received: by mail-io0-f194.google.com with SMTP id 5so18980348ioy.0; Mon, 20 Jun 2016 09:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=+80U797o6p8hRqClkfDZrmnG/lPbVFb/6xXjJkdzKAQ=; b=DRXM9L+M2MjrV7MTMKY67BLREYpWnQLUgchwcrNT7ucau/H1T6my4+ck4LCNwZznRf EFFCoyAeqLFkR3A9q7hPlYvhZMd/U03WXwG738e+yZOaqDZtZVybOpxYVfcOyO0yhUKR 7aQC7C3AiErm6pzKccZlr2pYCr5+CdJtKcvj+JEXbju+kz7X1HbDuirmBqeZo/XDFeW6 YhoPXxHY5/cnlg37X237QXXdQR0m+KthsIQjA+Fn7uBO385AuAM8sBTDCk+SeoxTF6FE 8+fXqrZGqDB6ZQbcZphg3UkSBZlHH8jX9QngzWNkFZNNtxGn1dRoGTkvtVcLStcWTDRH 3uHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=+80U797o6p8hRqClkfDZrmnG/lPbVFb/6xXjJkdzKAQ=; b=koAUYM6xR8/wX8pRoageZytPHh5XFDZE1kE/AizHfpz8qLk4tBCe5NCCBBBYMNRyRC 0zf5FdHoQ4+wPy4Kh2wQojNQxSg45OUNj52i899RUWdA67sHLzNIUCW8cxqaoRf3ctxT NSykQtfux4860pBlr3EB9ehOghqLasnrTRLBHFIBCS8a/LpJDCCcmF58WEm1zuzXQUlc 0rGyUXL7+Ds31UTQ45RmDtY77/g/0bhR9aSIlbVGfIxkPlRtI1ISG+GDVwSkLXPvOhAZ rphPidYM7Rucpqf+LdHoKGo4/zM+ql7IARO9rSo5hkjatoTEkqbtsBWsR10G45U6b2DI HzTA== X-Gm-Message-State: ALyK8tIKHWoGdG//6bIm6lUSvjrK0eSR/bqtO43gvicdYc/B+ZwjGdmTr6/HAzkxVBneDg== X-Received: by 10.107.130.75 with SMTP id e72mr22889973iod.69.1466439023034; Mon, 20 Jun 2016 09:10:23 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:1dce]) by smtp.gmail.com with ESMTPSA id 127sm29990905iov.34.2016.06.20.09.10.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jun 2016 09:10:22 -0700 (PDT) Subject: [PATCH v3 13/25] xprtrdma: Chunk list encoders must not return zero From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 20 Jun 2016 12:10:21 -0400 Message-ID: <20160620161021.10809.75135.stgit@manet.1015granger.net> In-Reply-To: <20160620155751.10809.22262.stgit@manet.1015granger.net> References: <20160620155751.10809.22262.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 Clean up, based on code audit: Remove the possibility that the chunk list XDR encoders can return zero, which would be interpreted as a NULL. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/fmr_ops.c | 2 ++ net/sunrpc/xprtrdma/frwr_ops.c | 2 ++ net/sunrpc/xprtrdma/rpc_rdma.c | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/fmr_ops.c b/net/sunrpc/xprtrdma/fmr_ops.c index add58b6..2f3fff1 100644 --- a/net/sunrpc/xprtrdma/fmr_ops.c +++ b/net/sunrpc/xprtrdma/fmr_ops.c @@ -247,6 +247,8 @@ fmr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, } mw->mw_nents = i; mw->mw_dir = rpcrdma_data_dir(writing); + if (i == 0) + goto out_dmamap_err; if (!ib_dma_map_sg(r_xprt->rx_ia.ri_device, mw->mw_sg, mw->mw_nents, mw->mw_dir)) diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c index d7613db9..f3a06fa 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -411,6 +411,8 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, } mw->mw_nents = i; mw->mw_dir = rpcrdma_data_dir(writing); + if (i == 0) + goto out_dmamap_err; dma_nents = ib_dma_map_sg(ia->ri_device, mw->mw_sg, mw->mw_nents, mw->mw_dir); diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index 77e002f..8fde0ab 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -329,7 +329,7 @@ rpcrdma_encode_read_list(struct rpcrdma_xprt *r_xprt, do { n = r_xprt->rx_ia.ri_ops->ro_map(r_xprt, seg, nsegs, false); - if (n <= 0) + if (n < 0) return ERR_PTR(n); *iptr++ = xdr_one; /* item present */ @@ -397,7 +397,7 @@ rpcrdma_encode_write_list(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req, nchunks = 0; do { n = r_xprt->rx_ia.ri_ops->ro_map(r_xprt, seg, nsegs, true); - if (n <= 0) + if (n < 0) return ERR_PTR(n); iptr = xdr_encode_rdma_segment(iptr, seg); @@ -462,7 +462,7 @@ rpcrdma_encode_reply_chunk(struct rpcrdma_xprt *r_xprt, nchunks = 0; do { n = r_xprt->rx_ia.ri_ops->ro_map(r_xprt, seg, nsegs, true); - if (n <= 0) + if (n < 0) return ERR_PTR(n); iptr = xdr_encode_rdma_segment(iptr, seg);