From patchwork Tue Jun 23 19:55:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223129 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.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 7A9CBC433E1 for ; Tue, 23 Jun 2020 21:30:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 55F9D20724 for ; Tue, 23 Jun 2020 21:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947813; bh=58BjIi//UUzgUCcWBw6C1zUX/jPjqYckyPctRZQbmuo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ekoq0KTt1Rz/2OCPoL7y+UpLq8AeUFMhBBAKMzFnh2xmKBq7q6zKZ+iQgPYCeUik2 V7BB+hYN1KpjWeboegaoowC5WPOE5ajxwahuduVALOZ6flQizDqq8dsBZrJQ5doJYv o0xlWsu6Wmy5Wsw3iG7ulPIGN922kUvEOleJ6IPI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389169AbgFWUOL (ORCPT ); Tue, 23 Jun 2020 16:14:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:56520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389166AbgFWUOK (ORCPT ); Tue, 23 Jun 2020 16:14:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E4822073E; Tue, 23 Jun 2020 20:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943250; bh=58BjIi//UUzgUCcWBw6C1zUX/jPjqYckyPctRZQbmuo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRaoj8vPiEQip+vT0wXjJRsLvhE5ObFCkoyb6uBhsqnbYiyD+JBMDr4NZ47iDIpX6 PHm6ol0AsyCjQBMeqOCDFasr0wDuahrwybpgXQC2Oe4F4hLcOMi73xY+sLOmDdNztV RSagl84oHf8WrjW/fmduw6DBNjciTzJiICsj3fkQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "J. Bruce Fields" , Sasha Levin Subject: [PATCH 5.7 319/477] nfsd: safer handling of corrupted c_type Date: Tue, 23 Jun 2020 21:55:16 +0200 Message-Id: <20200623195422.609917994@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 0c10bfea039eb..4a258065188e1 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -469,8 +469,7 @@ found_entry: 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;