From patchwork Tue Oct 16 16:30:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 1601541 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 B5D94DFFED for ; Tue, 16 Oct 2012 16:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754629Ab2JPQa4 (ORCPT ); Tue, 16 Oct 2012 12:30:56 -0400 Received: from mx2.netapp.com ([216.240.18.37]:15883 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754869Ab2JPQa4 (ORCPT ); Tue, 16 Oct 2012 12:30:56 -0400 X-IronPort-AV: E=Sophos;i="4.80,593,1344236400"; d="scan'208";a="701307824" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 16 Oct 2012 09:30:55 -0700 Received: from francist-pc.hq.netapp.com (francist-pc.hq.netapp.com [10.55.76.177] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id q9GGUnZH016423; Tue, 16 Oct 2012 09:30:55 -0700 (PDT) From: Weston Andros Adamson To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 02/25] SUNRPC: remove BUG_ON from rpc_bind_new_program Date: Tue, 16 Oct 2012 12:30:20 -0400 Message-Id: <1350405043-39316-2-git-send-email-dros@netapp.com> X-Mailer: git-send-email 1.7.9.6 (Apple Git-31.1) In-Reply-To: <1350405043-39316-1-git-send-email-dros@netapp.com> References: <1350405043-39316-1-git-send-email-dros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Instead of calling BUG_ON when rpc_bind_new_program gets an invalid rpc program version, print a KERN_ERR message and return -EINVAL. Signed-off-by: Weston Andros Adamson --- net/sunrpc/clnt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index abb7f5e..eacdb15 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -700,7 +700,11 @@ struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old, const struct rpc_version *version; int err; - BUG_ON(vers >= program->nrvers || !program->version[vers]); + if (vers >= program->nrvers || !program->version[vers]) { + pr_err("RPC: invalid program version %u for program %s\n", + vers, program->name); + return ERR_PTR(-EINVAL); + } version = program->version[vers]; clnt = rpc_clone_client(old); if (IS_ERR(clnt))