From patchwork Fri Mar 2 20:10:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Siedzik X-Patchwork-Id: 880851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=extremenetworks.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="t3jOPvDF"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ztL9b57JDz9s33 for ; Sat, 3 Mar 2018 07:14:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=B544EYTtrphtWeO3uCbXOFDUn++8ghm9kiAhQmsKiCc=; b=t3jOPvDFAWULt1 YAMIPvNZAPJXmfbmdaetuzzaVaMTnuBqo76/ZbBUcqh5Ub5FNyIuKQ2bU8E7ldNvdfBn/Gj8CUH25 JocJ9C4OCEbimqWI8OzIfP1tcHDX+jmPnp6KXfIpgiY8+1JTszhgwCIdsSU1Tsyjrhri4Y9QF3Zdp vDvPgcJX0r98WcUMVsJJjPMHiFCynXwytg5PudXXgsuL/NLdVw8JhPZCeBd/41j9YwekZqCz7ug1t Ozl//iUT2E0K2KRcLxBdUq+4wHkRBO+ZV9Riqp8LQ1Rn+sB1D4ZeTlEnxtvfhMD0N4dwQkU81vfRI 2KIEsViKQgTDmzylPvUA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1err40-0001ii-EG; Fri, 02 Mar 2018 20:13:56 +0000 Received: from us-smtp-delivery-183.mimecast.com ([216.205.24.183]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1err3M-0001Jn-0v for hostap@lists.infradead.org; Fri, 02 Mar 2018 20:13:20 +0000 Received: from USNC-CASHT-P2.corp.extremenetworks.com (owamail.extremenetworks.com [134.141.9.1]) (Using TLS) by us-smtp-1.mimecast.com with ESMTP id us-mta-104-QH8IcgjlPaGEAbB2PiLkYA-3; Fri, 02 Mar 2018 15:11:00 -0500 Received: from USNC-CASHT-P2.corp.extremenetworks.com (10.6.17.64) by USNC-CASHT-P2.corp.extremenetworks.com (10.6.17.64) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 2 Mar 2018 15:10:59 -0500 Received: from smtp2.extremenetworks.com (10.6.25.34) by USNC-CASHT-P2.corp.extremenetworks.com (10.6.17.64) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Fri, 2 Mar 2018 15:10:59 -0500 Received: from cm-exos1.extremenetworks.com (a10-smtp.extremenetworks.com [10.6.24.14]) by smtp2.extremenetworks.com (8.13.8/8.13.8) with ESMTP id w22KAwon004955; Fri, 2 Mar 2018 12:10:58 -0800 Received: from cm-exos1.extremenetworks.com (localhost [127.0.0.1]) by cm-exos1.extremenetworks.com (Postfix) with ESMTP id 0480C2C0416; Fri, 2 Mar 2018 15:11:10 -0500 (EST) Received: (from msiedzik@localhost) by cm-exos1.extremenetworks.com (8.14.7/8.14.7/Submit) id w22KBASP016346; Fri, 2 Mar 2018 15:11:10 -0500 From: To: Subject: [PATCH 11/15] mka: Fix a few minor bugs in CP state machine Date: Fri, 2 Mar 2018 15:10:59 -0500 Message-ID: <20180302201103.16264-12-msiedzik@extremenetworks.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180302201103.16264-1-msiedzik@extremenetworks.com> References: <20180302201103.16264-1-msiedzik@extremenetworks.com> MIME-Version: 1.0 X-MC-Unique: QH8IcgjlPaGEAbB2PiLkYA-3 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.205.24.183 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mike Siedzik Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Mike Siedzik All fixes per IEEE802.1X-2010 Figure 12-2 - CP state machine. 1) Upon entering RETIRE, deleteSAs(oki) 2) RECEIVING to TRANSMIT, add !controlledPortEnabled to branching logic 3) READY should move to ABANDON (not RECEIVE) when new_sak or changed_connect is true. 4) READY to TRANSMIT, add !controlledPortEnabled to branching logic Signed-off-by: Michael Siedzik --- src/pae/ieee802_1x_cp.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.11.1 diff --git a/src/pae/ieee802_1x_cp.c b/src/pae/ieee802_1x_cp.c index e6b2767e2..05eab7e4b 100644 --- a/src/pae/ieee802_1x_cp.c +++ b/src/pae/ieee802_1x_cp.c @@ -319,8 +319,11 @@ SM_STATE(CP, RETIRE) SM_ENTRY(CP, RETIRE); /* RETIRE state machine not keep with Figure 12-2 in * IEEE Std 802.1X-2010 */ - os_free(sm->oki); - sm->oki = NULL; + if (sm->oki) { + ieee802_1x_kay_delete_sas(sm->kay, sm->oki); + os_free(sm->oki); + sm->oki = NULL; + } sm->orx = FALSE; sm->otx = FALSE; ieee802_1x_kay_set_old_sa_attr(sm->kay, sm->oki, sm->oan, @@ -382,7 +385,7 @@ SM_STEP(CP) if (!sm->elected_self) SM_ENTER(CP, READY); if (sm->elected_self && - (sm->all_receiving || !sm->transmit_when)) + (sm->all_receiving || !sm->controlled_port_enabled || !sm->transmit_when)) SM_ENTER(CP, TRANSMIT); break; @@ -405,8 +408,8 @@ SM_STEP(CP) case CP_READY: if (sm->new_sak || changed_connect(sm)) - SM_ENTER(CP, RECEIVE); - if (sm->server_transmitting) + SM_ENTER(CP, ABANDON); + if (sm->server_transmitting || !sm->controlled_port_enabled) SM_ENTER(CP, TRANSMIT); break; case CP_ABANDON: