From: Jacek Kalwas <jacek.kalwas@intel.com>
To: davem@davemloft.net
Cc: Jacek Kalwas <jacek.kalwas@intel.com>,
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 [thread overview]
Message-ID: <20180412190315.3102-3-jacek.kalwas@intel.com> (raw)
In-Reply-To: <20180412190315.3102-1-jacek.kalwas@intel.com>
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 <jacek.kalwas@intel.com>
---
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;
}
--
2.14.3
--------------------------------------------------------------------
Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN.
Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek
przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by
others is strictly prohibited.
next prev parent reply other threads:[~2018-04-12 19:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-12 19:03 [net] udp: enable UDP checksum offload for ESP Jacek Kalwas
2018-04-12 19:03 ` [net] xfrm: allow to release xfrm_state with flush Jacek Kalwas
2018-04-19 6:56 ` Steffen Klassert
2018-04-12 19:03 ` Jacek Kalwas [this message]
2018-04-13 11:09 ` [net] xfrm: cover crypto status in xfrm_input Steffen Klassert
2018-04-19 6:54 ` [net] udp: enable UDP checksum offload for ESP Steffen Klassert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180412190315.3102-3-jacek.kalwas@intel.com \
--to=jacek.kalwas@intel.com \
--cc=davem@davemloft.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox