From patchwork Wed Oct 2 13:48:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Fields X-Patchwork-Id: 2974911 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82FDABFF0B for ; Wed, 2 Oct 2013 13:48:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DD9D203A3 for ; Wed, 2 Oct 2013 13:48:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C73D5203A8 for ; Wed, 2 Oct 2013 13:48:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754291Ab3JBNsU (ORCPT ); Wed, 2 Oct 2013 09:48:20 -0400 Received: from fieldses.org ([174.143.236.118]:39266 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754189Ab3JBNsT (ORCPT ); Wed, 2 Oct 2013 09:48:19 -0400 Received: from bfields by fieldses.org with local (Exim 4.76) (envelope-from ) id 1VRMmn-0003qV-54; Wed, 02 Oct 2013 09:48:17 -0400 From: "J. Bruce Fields" To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 1/2] rpc: change BUG to WARN in gss_encode_v1_msg Date: Wed, 2 Oct 2013 09:48:14 -0400 Message-Id: <1380721695-14755-1-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "J. Bruce Fields" Failure of this assertion would indeed be serious, but as we've seen a BUG() in a worker thread (this can run from rpciod context) can screw up the system so badly that the oops doesn't even get to the logs; better to WARN() and soldier on. Signed-off-by: J. Bruce Fields --- net/sunrpc/auth_gss/auth_gss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 0846566..254a9f0 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -454,7 +454,7 @@ static void gss_encode_v1_msg(struct gss_upcall_msg *gss_msg, gss_msg->msg.len += len; gss_msg->msg.data = gss_msg->databuf; - BUG_ON(gss_msg->msg.len > UPCALL_BUF_LEN); + WARN_ON_ONCE(gss_msg->msg.len > UPCALL_BUF_LEN); } static struct gss_upcall_msg *