From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:37592 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751921AbbIZG1D (ORCPT ); Sat, 26 Sep 2015 02:27:03 -0400 Subject: Patch "nfs: Fix truncated client owner id without proto type" has been added to the 4.2-stable tree To: kinglongmee@gmail.com, gregkh@linuxfoundation.org, trond.myklebust@primarydata.com Cc: , From: Date: Fri, 25 Sep 2015 20:55:50 -0700 Message-ID: <144323975014159@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled nfs: Fix truncated client owner id without proto type to the 4.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nfs-fix-truncated-client-owner-id-without-proto-type.patch and it can be found in the queue-4.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 4a70316caef7d158445e672e146eb9f1b8c1aeee Mon Sep 17 00:00:00 2001 From: Kinglong Mee Date: Mon, 31 Aug 2015 10:53:33 +0800 Subject: nfs: Fix truncated client owner id without proto type From: Kinglong Mee commit 4a70316caef7d158445e672e146eb9f1b8c1aeee upstream. The length of "Linux NFSv4.0 " is 14, not 10. Without this patch, I get a truncated client owner id as, "Linux NFSv4.0 ::1/::1" With this patch, "Linux NFSv4.0 ::1/::1 tcp" Fixes: a319268891 ("nfs: make nfs4_init_nonuniform_client_string use a dynamically allocated buffer") Signed-off-by: Kinglong Mee Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4989,7 +4989,7 @@ nfs4_init_nonuniform_client_string(struc return 0; retry: rcu_read_lock(); - len = 10 + strlen(clp->cl_ipaddr) + 1 + + len = 14 + strlen(clp->cl_ipaddr) + 1 + strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)) + 1 + strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_PROTO)) + Patches currently in stable-queue which might be from kinglongmee@gmail.com are queue-4.2/nfs-fix-a-null-pointer-dereference-of-migration-recovery-ops-for-v4.2-client.patch queue-4.2/nfs-fix-truncated-client-owner-id-without-proto-type.patch queue-4.2/nfsd-fix-an-fs_layout_types-layout_types-encode-bug.patch