From patchwork Thu Apr 18 02:26:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2457241 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4F9F7DF23A for ; Thu, 18 Apr 2013 02:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964933Ab3DRC03 (ORCPT ); Wed, 17 Apr 2013 22:26:29 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:46593 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964925Ab3DRC03 (ORCPT ); Wed, 17 Apr 2013 22:26:29 -0400 Received: by mail-wi0-f179.google.com with SMTP id l13so1725741wie.6 for ; Wed, 17 Apr 2013 19:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=tK84S81EAWkuSMbDjrLrLSKspwcb24aFC+2jXq2TqrY=; b=ubW5HYZ7kYJrlm7zPDELQUX16tbBZPpc5ilTIiv4C7KwNReFPI1fVsJsRCMiZlPGzZ 79LwVOUrqbW1RM0c3a9/Mr5HJE9rctMPHG4N/e+cDHbrNfx3cjNkpZhxLkB/hLCsv5/6 cqWWROT7oNUtY/9Djw0CNjtwo0uVphoNatMUKZ1u0pAKkR+f06K0n4dUf9nePjWGl+rJ a1Yh0F4w7mqrDEslyzMu7wIGDuL2pWRnY13HgT+aM75l/JKSQmcC8c7f6MHJeyfRux/u H5k/dgOjJnig1s+CHRFqZUmbVZB/sFNJcjHCvSxOLGlLmgMx2HcNVYodtKmJAeNTua76 8Viw== MIME-Version: 1.0 X-Received: by 10.194.176.195 with SMTP id ck3mr15279172wjc.5.1366251987548; Wed, 17 Apr 2013 19:26:27 -0700 (PDT) Received: by 10.194.51.1 with HTTP; Wed, 17 Apr 2013 19:26:27 -0700 (PDT) Date: Thu, 18 Apr 2013 10:26:27 +0800 Message-ID: Subject: [PATCH] svcauth_gss: fix error return code in rsc_parse() From: Wei Yongjun To: bfields@fieldses.org, Trond.Myklebust@netapp.com, ebiederm@xmission.com, skinsbursky@parallels.com, jlayton@redhat.com, simo@redhat.com Cc: yongjun_wei@trendmicro.com.cn, linux-nfs@vger.kernel.org Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Wei Yongjun Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun --- net/sunrpc/auth_gss/svcauth_gss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 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/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 5ead605..c2156fb 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -505,8 +505,10 @@ static int rsc_parse(struct cache_detail *cd, len = qword_get(&mesg, buf, mlen); if (len > 0) { rsci.cred.cr_principal = kstrdup(buf, GFP_KERNEL); - if (!rsci.cred.cr_principal) + if (!rsci.cred.cr_principal) { + status = -ENOMEM; goto out; + } } }