Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 22 Nov 2016 17:36:16 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r309014 - head/sys/net80211
Message-ID:  <201611221736.uAMHaGZw054999@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adrian
Date: Tue Nov 22 17:36:16 2016
New Revision: 309014
URL: https://svnweb.freebsd.org/changeset/base/309014

Log:
  [net80211] high oops on the high seas, or "god damnit compilers, it's 2016 and you're supposed to save me from this."
  
  TODO:
  
  * drink real coffee before committing in the morning, or there's a high
    risk of more obviously self-evident commits being turned into attempts
    at humour.
  
  Reported by:	cem, Coverity CID 1366219

Modified:
  head/sys/net80211/ieee80211_crypto_ccmp.c

Modified: head/sys/net80211/ieee80211_crypto_ccmp.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto_ccmp.c	Tue Nov 22 17:14:09 2016	(r309013)
+++ head/sys/net80211/ieee80211_crypto_ccmp.c	Tue Nov 22 17:36:16 2016	(r309014)
@@ -241,7 +241,7 @@ ccmp_decap(struct ieee80211_key *k, stru
 
 	rxs = ieee80211_get_rx_params_ptr(m);
 
-	if ((rxs != NULL) & (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))
+	if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))
 		goto finish;
 
 	/*
@@ -286,7 +286,7 @@ finish:
 	/*
 	 * Copy up 802.11 header and strip crypto bits.
 	 */
-	if (! ((rxs != NULL) & (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))) {
+	if (! ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))) {
 		ovbcopy(mtod(m, void *), mtod(m, uint8_t *) + ccmp.ic_header,
 		    hdrlen);
 		m_adj(m, ccmp.ic_header);
@@ -295,13 +295,13 @@ finish:
 	/*
 	 * XXX TODO: see if MMIC_STRIP also covers CCMP MIC trailer.
 	 */
-	if (! ((rxs != NULL) & (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP)))
+	if (! ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP)))
 		m_adj(m, -ccmp.ic_trailer);
 
 	/*
 	 * Ok to update rsc now.
 	 */
-	if (! ((rxs != NULL) & (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))) {
+	if (! ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))) {
 		k->wk_keyrsc[tid] = pn;
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611221736.uAMHaGZw054999>