From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDB42C433E0 for ; Thu, 18 Jun 2020 02:32:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC8ED206E2 for ; Thu, 18 Jun 2020 02:32:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447567; bh=5U5PiWIjiwW7vjikoQHtJKRjG+IOR2gWNoMdCr8MBEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lEmdx25pmmfm2ff0jGC1fv6ppOI39X3nTQsYH1a0NH2SVeDFn+Ux35VdF0U/6bKcu G9TJCGS2ASlxftgs13rTGg/dqimoXnyDwkB6Qe79/srNI/dFFeEvlLL66MQNdcEryp XKdMx4ABWDS5X571rUXO/LXXnKMeRA2OXfYgebfs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387444AbgFRCcq (ORCPT ); Wed, 17 Jun 2020 22:32:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:45116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729441AbgFRBPI (ORCPT ); Wed, 17 Jun 2020 21:15:08 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7C6B221D7B; Thu, 18 Jun 2020 01:15:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442908; bh=5U5PiWIjiwW7vjikoQHtJKRjG+IOR2gWNoMdCr8MBEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vDDK0HyOhVc5PIBzQ73MG2Yf0bLEfSxGT14ps3D3E9jrbx+K9xO+j19Z9Q93YCkv7 iEAc8ctOnvqU2SOW4FaGQs2w8pO3z6ZmupJyteIe7TgCnq6TqH6qSQLlmGqDB1iUPS ENXVNvgFp6/mR2nfCZRU1Tzm8temhYxuqSjD672Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "J. Bruce Fields" , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 327/388] nfsd: safer handling of corrupted c_type Date: Wed, 17 Jun 2020 21:07:04 -0400 Message-Id: <20200618010805.600873-327-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "J. Bruce Fields" [ Upstream commit c25bf185e57213b54ea0d632ac04907310993433 ] This can only happen if there's a bug somewhere, so let's make it a WARN not a printk. Also, I think it's safest to ignore the corruption rather than trying to fix it by removing a cache entry. Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfscache.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 0c10bfea039e..4a258065188e 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -469,8 +469,7 @@ nfsd_cache_lookup(struct svc_rqst *rqstp) rtn = RC_REPLY; break; default: - printk(KERN_WARNING "nfsd: bad repcache type %d\n", rp->c_type); - nfsd_reply_cache_free_locked(b, rp, nn); + WARN_ONCE(1, "nfsd: bad repcache type %d\n", rp->c_type); } goto out; -- 2.25.1