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 2257EC433E2 for ; Mon, 14 Sep 2020 17:10:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9711206F4 for ; Mon, 14 Sep 2020 17:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600103457; bh=zO728aZsMd5bNcF2kwLu6UaHOI+g3+e4OHBK9nTv7dY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=a+2b2RLAWdy06JMKLpysfay87flP3Vv77XCqIy4DE9/3RnmX4n5tmpTaj0nngKwBt A+0QCAoZCiVR1fh1vbLKsB6GmYs+QllWTAXDQERJivzkqMEHJrLdMUXTejgicP2WWr Xc0fjwMHgR07Mvv5xCKwJZWz/Aho5jxsNJbNL3fg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726347AbgINRK4 (ORCPT ); Mon, 14 Sep 2020 13:10:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:60294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726592AbgINNEt (ORCPT ); Mon, 14 Sep 2020 09:04:49 -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 9F6EB221EF; Mon, 14 Sep 2020 13:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088655; bh=zO728aZsMd5bNcF2kwLu6UaHOI+g3+e4OHBK9nTv7dY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oVp9RYpWQOxkOFRcnslZLegjpo+1d6DEuAFYC16WZlL2AuSDSsGf1Cg0t0sc3OTd3 ZF8rB7vmnacgIJFRjlB9vj5akVOZasDrif4/nhvP/JOLydTQpIgtLFyMSt5z1kawpG E55Io8tQ7CnV+TPoIAq/t6rhlt8HZd4YUikhQhag= 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 5.8 14/29] SUNRPC: stop printk reading past end of string Date: Mon, 14 Sep 2020 09:03:43 -0400 Message-Id: <20200914130358.1804194-14-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130358.1804194-1-sashal@kernel.org> References: <20200914130358.1804194-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 c27123e6ba80c..4a67685c83eb4 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c @@ -982,8 +982,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