From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932873AbbANHov (ORCPT ); Wed, 14 Jan 2015 02:44:51 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:58913 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755289AbbANHjH (ORCPT ); Wed, 14 Jan 2015 02:39:07 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Coddington , "J. Bruce Fields" Subject: [PATCH 3.10 34/44] nfsd4: fix xdr4 inclusion of escaped char Date: Tue, 13 Jan 2015 23:23:55 -0800 Message-Id: <20150114072229.303404099@linuxfoundation.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <20150114072227.419663002@linuxfoundation.org> References: <20150114072227.419663002@linuxfoundation.org> User-Agent: quilt/0.63-1 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Benjamin Coddington commit 5a64e56976f1ba98743e1678c0029a98e9034c81 upstream. Fix a bug where nfsd4_encode_components_esc() includes the esc_end char as an additional string encoding. Signed-off-by: Benjamin Coddington Fixes: e7a0444aef4a "nfsd: add IPv6 addr escaping to fs_location hosts" Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4xdr.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1743,6 +1743,9 @@ static __be32 nfsd4_encode_components_es } else end++; + if (found_esc) + end = next; + str = end; } *pp = p;