From patchwork Thu Apr 12 19:03:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Kalwas X-Patchwork-Id: 897769 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40MVfH1Z74z9s1l for ; Fri, 13 Apr 2018 05:02:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753468AbeDLTCo (ORCPT ); Thu, 12 Apr 2018 15:02:44 -0400 Received: from mga09.intel.com ([134.134.136.24]:62469 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752877AbeDLTCn (ORCPT ); Thu, 12 Apr 2018 15:02:43 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Apr 2018 12:02:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,443,1517904000"; d="scan'208";a="216149252" Received: from jtkirshe-nuc.jf.intel.com ([134.134.177.59]) by orsmga005.jf.intel.com with ESMTP; 12 Apr 2018 12:02:43 -0700 From: Jacek Kalwas To: davem@davemloft.net Cc: Jacek Kalwas , netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org Subject: [net] xfrm: cover crypto status in xfrm_input Date: Thu, 12 Apr 2018 12:03:15 -0700 Message-Id: <20180412190315.3102-3-jacek.kalwas@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180412190315.3102-1-jacek.kalwas@intel.com> References: <20180412190315.3102-1-jacek.kalwas@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Status checking in xfrm_input doesn't cover CRYPTO_GENERIC_ERROR and CRYPTO_INVALID_PACKET_SYNTAX. Given patch adds additional check for CRYPTO_INVALID_PACKET_SYNTAX and treats CRYPTO_GENERIC_ERROR as status matching LINUX_MIB_XFRMINERROR. Signed-off-by: Jacek Kalwas --- net/xfrm/xfrm_input.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 352abca2605f..08d70ea774f9 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -285,7 +285,12 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) goto drop; } - XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR); + if (xo->status & CRYPTO_INVALID_PACKET_SYNTAX) { + XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR); + goto drop; + } + + XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR); goto drop; }