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 X-Spam-Level: X-Spam-Status: No, score=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D57BFC2BC11 for ; Mon, 14 Sep 2020 13:21:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A47042075A for ; Mon, 14 Sep 2020 13:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600089705; bh=tuaTiQei/i3Lpz/htWALCQkFU1BPdyiproFme4Yr4L8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BxQiwK2X+2W5OIxfAafjm3N5UH850wY7poQ9zzD01PGWDzo2QfD4UxKBwP4BDMw6C jxlHUP4HLEe/dxeXimmYIA3yloFvNPdQM5Tg1hnJkAL4LJHkaE514DZkoEj4dzB4Zk 2O5ww6MK3EX44kB0QvNuJSHSgwJXWEU40ul4A2HE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726578AbgINNVm (ORCPT ); Mon, 14 Sep 2020 09:21:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:32956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726116AbgINNHQ (ORCPT ); Mon, 14 Sep 2020 09:07:16 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4DB41206B2; Mon, 14 Sep 2020 13:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088765; bh=tuaTiQei/i3Lpz/htWALCQkFU1BPdyiproFme4Yr4L8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a9Gv2PXikcG3y7Pm4sGLxIowpf0HccAJijv2ENaeTWyTTTAS+3UdA7x0O/6tt25u9 Zl7vu8GNe/g1GXw4HCe2ivt7lRitNJjOSZPPFojXuK8MkdtRhUzBNvZcvlHxbK2ovz AWJkWYYqR1352qhnJK373Z324G0USJ718ubXkmEM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "J. Bruce Fields" , Zhi Li , Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 4/8] SUNRPC: stop printk reading past end of string Date: Mon, 14 Sep 2020 09:05:54 -0400 Message-Id: <20200914130559.1805574-4-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130559.1805574-1-sashal@kernel.org> References: <20200914130559.1805574-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "J. Bruce Fields" [ Upstream commit 8c6b6c793ed32b8f9770ebcdf1ba99af423c303b ] Since p points at raw xdr data, there's no guarantee that it's NULL terminated, so we should give a length. And probably escape any special characters too. Reported-by: Zhi Li Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/rpcb_clnt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index c89626b2afffb..696381a516341 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c @@ -977,8 +977,8 @@ static int rpcb_dec_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr, p = xdr_inline_decode(xdr, len); if (unlikely(p == NULL)) goto out_fail; - dprintk("RPC: %5u RPCB_%s reply: %s\n", req->rq_task->tk_pid, - req->rq_task->tk_msg.rpc_proc->p_name, (char *)p); + dprintk("RPC: %5u RPCB_%s reply: %*pE\n", req->rq_task->tk_pid, + req->rq_task->tk_msg.rpc_proc->p_name, len, (char *)p); if (rpc_uaddr2sockaddr(req->rq_xprt->xprt_net, (char *)p, len, sap, sizeof(address)) == 0) -- 2.25.1