From patchwork Tue Feb 11 19:26:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13970538 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 015792690F2 for ; Tue, 11 Feb 2025 19:27:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302026; cv=none; b=ELyw/URhZOywZ2Zh51DUh4Xgt5+nLI1ftnoGTIlLn9GRcBOLBJJTDN3x0YkNeCXdqXoBSqZmmiVIJuMrmDz7SE2BcCGXXP0DmGrxJjBnUJzBysFsdjhdXzwAY1E1+MnvTSDgK4pZakT+GuaGNL1m9/I5zOI/uRdlUvWwKvMawTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302026; c=relaxed/simple; bh=Ae8ishP9HSnR8xHa9lW9/XB27vUXAz7jv/QgDY9W0B4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=RIg8fVoFAvFLs21ieGApMfn5tRr6Dz7Ph/TmkR/0YHIOwbcYOD4R5fAxEmw66BDBaRIIWDptXOMREyGqhVHi7kgx3FPv04xS6iU6okPVvAXE0xwqfJMyUGsn6lkEGKp4KR5/ilV0264K6ZOvpo2WwLR+kHM9ciHSbHUZuxDP/6M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gQoxZ109; arc=none smtp.client-ip=209.85.160.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gQoxZ109" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4718d9dbcd3so36330871cf.1 for ; Tue, 11 Feb 2025 11:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739302024; x=1739906824; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=memb4uFhdww4OmKs4VK9liMd+EgKjITX9t4n1kRFoOk=; b=gQoxZ109JnYPo8yggg1bzrWu1sEUzF92WNlLNEgyGvTiLbdpxPPoBXzzp0c9ZP5Kt8 2qxnziPGY4wzeLUvjwjn0c2+3ZGL53bPTChlExgBsANsjZKo+F0Mty0eaHWLaU2IvUDV xjRZdHk4u9l3Mi+a+vDx1our+YaZXvOLLsiSYo8mePo/ADHA3lmmVOGjF5nZgYAsJvqZ uYJ6iUiLhLPcQHeDUbVtZIRzxYo5583rA/Cn1/qRyB25RggJlAswGgDu7floO3iJq2wB zMJ/6cGEamrLqdjCl1qZuBDgTFKbiPzPAj17j3zkBbCc3pcZcJJbdCNrwahWOBvjwfXs m9zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739302024; x=1739906824; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=memb4uFhdww4OmKs4VK9liMd+EgKjITX9t4n1kRFoOk=; b=Z9YU4ImktGzLEubpr22xB5a0DKzqjpg7qSCvYtgbWbqgp9yxsawLCqNmqd6fnZ9zGq /2w5XOr1uDr28ocNtlCor84r2gl9DcmIcpEcqfIh9ft+2fsajVr6odGoh0QC4B1rMPe6 NzWUObF79/S3aQ3twnMaAlxgChxfQQa5tEMoU/WIpF7Te2LstzJoT7uJB0eBeZyf1Nxj FEfjYiAm7p2zyLgcS3IYBTbVvQwX6wjJKOkI4ZogsQ49qkRxe5vIH4i+4GvY7OJNlpmM 2gYBzu+WXxPHM+eE2PNM/Qs+dfMAzZ4YpXLc5maygaD+88z7+bk2ZxG5LFoSX9cWntN6 dHTA== X-Gm-Message-State: AOJu0YywEomnVsy6NoD1C82taVO4aVTkJBysIQ6im7zlPKpXYyLng24A TPJFlBD+fOKthCXSSQpwEzaIPYym+xj+Z4pj0JhsL2StSd1z4Tdvqp+LNg== X-Gm-Gg: ASbGncvEnjIvrOyOGjFy+QRAdB3wFTVL9bAPwdrdtyi8Xt7EfGOaDLrLjTSQSF168z9 XmMfgcu5Qtru/Y0fvBQogPWMOo1576+aWsFOtu33z2xorkthSge2ZYF9Er9IVMC+QiYqVmGdeEZ GSTFtFUJZHO4AZL8p/zsYqin7JrY9FCJKTHAz52EVpsjOUMWIh8Yftcl0/u2e5/ke4ld7JMse1f XAaWZe2scTXbuKuF1rLJNv+elz3gH/hlOH7K8ZRmpm/Is5ZlDO92za8wA+VBEGmTf8GrjzqMyyp 7EeD3Vghfw/ePqoZsMF6Guz67w2yIo0Splq0B7GADyuCkXBW0A== X-Google-Smtp-Source: AGHT+IFr1F4uMq4HU7TSi2MZYsIjYwNztMDWUwuLc/a+grq9qCpx0p3uVPDqqQdZrZmA8I+jMlF25w== X-Received: by 2002:ac8:7f8d:0:b0:467:50b8:63aa with SMTP id d75a77b69052e-471afe645cfmr4958971cf.28.1739302022043; Tue, 11 Feb 2025 11:27:02 -0800 (PST) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4719dab7aadsm18681601cf.51.2025.02.11.11.27.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 11:27:01 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 1/4] eap: initialize vendor_id/vendor_type to zero Date: Tue, 11 Feb 2025 11:26:53 -0800 Message-Id: <20250211192656.83157-1-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This fixes a compiler warning, specifically on ARM/GCC 12.2.0 src/eap.c: In function ‘eap_rx_packet’: src/eap.c:419:57: error: ‘vendor_type’ may be used uninitialized [-Werror=maybe-uninitialized] 419 | (type == EAP_TYPE_EXPANDED && vendor_id == (id) && vendor_type == (t)) | ^~ src/eap.c:429:18: note: ‘vendor_type’ was declared here 429 | uint32_t vendor_type; | ^~~~~~~~~~~ src/eap.c:419:49: error: ‘vendor_id’ may be used uninitialized [-Werror=maybe-uninitialized] 419 | (type == EAP_TYPE_EXPANDED && vendor_id == (id) && vendor_type == (t)) | ^~ src/eap.c:428:18: note: ‘vendor_id’ was declared here 428 | uint32_t vendor_id; | ^~~~~~~~~ --- src/eap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eap.c b/src/eap.c index 9e924577..1a03fbcb 100644 --- a/src/eap.c +++ b/src/eap.c @@ -425,8 +425,8 @@ static void eap_handle_response(struct eap_state *eap, const uint8_t *pkt, size_t len) { enum eap_type type; - uint32_t vendor_id; - uint32_t vendor_type; + uint32_t vendor_id = 0; + uint32_t vendor_type = 0; enum eap_type our_type = eap->method->request_type; uint32_t our_vendor_id = (eap->method->vendor_id[0] << 16) | (eap->method->vendor_id[1] << 8) | From patchwork Tue Feb 11 19:26:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13970539 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C287F2690EF for ; Tue, 11 Feb 2025 19:27:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302026; cv=none; b=RZONl593NRZmENWn92sHp1mT5ldBtIlVj1vw0ok/KTCEPF/NxI3XWZVGBxaeQ8VUamJnqsPID1RsmYAp77K5uqDrUh/k/ffxO4ZAjqtuWzCQOv0tc3WRSKHVdNUqq/bJrn68lnRa973jBcDMMC81jMDZ5NLblrDuxtnDq/DTlBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302026; c=relaxed/simple; bh=tyVE9taFYqikiaPZ7fH2nz5+5vd7oB5zUaT5744pTvU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jL9MYp5OnJdVj+lVhNQkzd2S/7qbPyl0sxmMC1Qzk2d7vxeGca5SYjm0v1YEv7j/Hw+dTbhjGWVAIVHzxhD+3b4akcNflR9/EecwJJSwjIz66XuC2S8L4PGHTYe0a7w98/KsiOb/+RhEyYwBTuRpLPhu3BPg75KZV7PzrRwU8Uk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ODJ/k4KK; arc=none smtp.client-ip=209.85.160.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ODJ/k4KK" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-47196e33b43so21081381cf.1 for ; Tue, 11 Feb 2025 11:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739302023; x=1739906823; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CUaluhXfXv173xJ8vOsAbie1/7Iai/mBhv3CsyBmGzI=; b=ODJ/k4KKXKZk4Be2NWfj0SZwrO1+0U0z6HFh4JCtYRCdJUhM4OM0IDeiowGkZRepgW IpPl0daYXyKRiC8Ned5KuyQ+rPcMhFQlQD6nOqOuhJMtRTv5prtETNQDKeA3QU/S0bNq fdVvF6jpq/CIwcZcFqXMEwZGefRqfrWdWvdtRR3re6QQvTF5MH/nUZTmKhoIAy8cuuIJ ePV/W+mncAkSTOW0iKYtgR+2yuJVqQGOriP6Ldw7yINMuSSQ1z4zhDB5kAhaw1kVNx0T OTI0+jdBe3vypUvk9tbXtIDmiRfl5ZshiimHVlhk3mcE++y8MKXAV/9is4fdLSdgMkgg aK7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739302023; x=1739906823; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CUaluhXfXv173xJ8vOsAbie1/7Iai/mBhv3CsyBmGzI=; b=kykFHbHUmbxngxSs60yl8YvfiM3tqZdOFCvpZmZQQrbBJmCCsRWQHuuFWJhdUzsU05 XFh79qKrzqgb0vpEYM113+WXDHFzzhjyZNPcwtCJNnOb6iPjpfqbdqRU82gr90NDz2yC vZCTML4rLx/iwKq93QI2iIGavbZxJqJuPDGcO5AAvo9BXEYMN+CI7lbxAJbQvQiWkJxm UNJvkxkTsfI+ad8sg+iDkQKCpikIhyjGuLEQ8wF9kmTRcxlgeW7Ye3/f2RsbJwMM81q1 Cy8kI8F7ix5Co1bCuXiATW9fSQvoXI/zPXWWU9MFctB9paRL2NAA+uNl4GLYNrDmzj+Q tLBg== X-Gm-Message-State: AOJu0YzS7gFeLbhjYhEvmpUxvutexs3qc+2tRzL0EHPxDOGyoxspwnf7 W+C4QMWhHZKb6Olro+m3sJMmcwgS4zo1j41ew1vUhqA0ZtqTO8Crw8a+8w== X-Gm-Gg: ASbGncsbHF8Q/MaMr/+/Vee+wl9zqSWP+5gxWB7kJlfm6RrjQ1pmEKRNVY01enLEw2Y xKVLB13e+wvKTZ1wJBT/q0+hAPpeQlyBYOWkJRKiJ21NCwJbwBkd9Mek0AUCj3nyImBvAxDLdcV OyuuDWsmEmBNgSWTtWODpaR2iTgc7yXZpZsA4YVZ8SYe1fBKA98e5jKp1G+UmEgcZ5hFXoI193z u05Ys2DTG2jhhCUTuy+f7S6jvrErA2KSKa4BqdDL47plpQZNkM4nzPaozyNuc7P/EE+kN1QKlkn ZzvqJzcBVZV9BGEuty87/JB1J/lcP/14CEvkmH+NHJPvCLioyA== X-Google-Smtp-Source: AGHT+IGzok8jSrmxXnhfBfp3jTHhmOx89bWZxE4oUloNquQYiwO+I4m7j3DSZnqPgx88z4o41sYMbA== X-Received: by 2002:ac8:7f10:0:b0:471:9c86:2948 with SMTP id d75a77b69052e-471afecd206mr3358121cf.42.1739302023429; Tue, 11 Feb 2025 11:27:03 -0800 (PST) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4719dab7aadsm18681601cf.51.2025.02.11.11.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 11:27:03 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 2/4] netdev: fail the connection if sending external auth fails Date: Tue, 11 Feb 2025 11:26:54 -0800 Message-Id: <20250211192656.83157-2-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250211192656.83157-1-prestwoj@gmail.com> References: <20250211192656.83157-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This prevents IWD from hanging after external auth fails. In addition (as described in the comment) unless IWD actually issues a disconnect the driver/kernel gets into a state where it no longer accepts any commands, for example: Received error during CMD_TRIGGER_SCAN: Resource temporarily unavailable (11) --- src/netdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/netdev.c b/src/netdev.c index 7af3c39a..611fb597 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -3468,11 +3468,22 @@ static void netdev_external_auth_sae_tx_authenticate(const uint8_t *body, static void netdev_external_auth_cb(struct l_genl_msg *msg, void *user_data) { + struct netdev *netdev = user_data; int error = l_genl_msg_get_error(msg); - if (error < 0) + if (error < 0) { l_debug("Failed to send External Auth: %s(%d)", strerror(-error), -error); + + /* + * Without an explicit disconnect here brcmfmac gets into a + * broken state and returns "Resource temporarily unavailable + * for any subsequent scans/commands + */ + netdev_disconnect_and_fail_connection(netdev, + NETDEV_RESULT_AUTHENTICATION_FAILED, + MMPDU_REASON_CODE_UNSPECIFIED); + } } static void netdev_send_external_auth(struct netdev *netdev, From patchwork Tue Feb 11 19:26:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13970540 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C3162690EF for ; Tue, 11 Feb 2025 19:27:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302028; cv=none; b=UdTAIr48BgFzlKFwTGM9Zug5pO9XupZ5glpgvymXJnD5tWj4alXODFchvLs0akrtXhWPyW6/0UlI7eNdvF7h8LZ83IrWI/Sm/QQGaZ027ylcWT5DwAZXUbVFoKrzHZjL6u0B3WvXN2VXLl0XvnydcIdveh789FBx40xiRc5G/Uw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302028; c=relaxed/simple; bh=9pClswXSsZ5AX374x0YoBAYYuHQMKaDsMRLo7gQS9nA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sYu+4k+DOHQkNIXdkn/bhZbYEfXR+uH/qqB7PXn/krO6y4oStncYcw05D3aFCua2/O+IzvHmzekMZsmrHyMNTAYmjqq5AxR9H1nb42CzcEoOZxIYJqA9ldOguMU20W0Uks9L3EYT9b9PW0WVo5fQarIITH0Zlis/7mRngLA34Ds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SrB4sgTi; arc=none smtp.client-ip=209.85.160.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SrB4sgTi" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-46c8474d8f6so49129351cf.3 for ; Tue, 11 Feb 2025 11:27:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739302025; x=1739906825; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NP/a1qZML3T2OhAr0dqWzGNQ551Bn9BoWtVMdFbccTc=; b=SrB4sgTiWDt7u+FHab8/TvYXCGOBAfbMaio+3vcI3zwUYawYZsG2C27cnIRK7k7mKs wwxCUkw43QMwKl51jmOlPv0EzJGFX0vgX+mLp1nmpi0RDY8ohhnUGSeFEwFBSrZ1uz+n jSzVyURTlZKQWwZDAw/LlMEkM+qYpXsrWED4URsVPCuDyTRqwucxCzJHgjP6nLixEgnm 3tfmVMNsE36XYKDr5yuRkro9EpJST+94yazS/lXwkIn0b1p8WJEHviKX2KJbYKpq7oOD PaEvCPsbNPpM3VXdPK1+GxrjMXwB0r87g6ftB9kaBA8EGAcUsNLVG3yPKAZ2WkjM+kMj JJLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739302025; x=1739906825; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NP/a1qZML3T2OhAr0dqWzGNQ551Bn9BoWtVMdFbccTc=; b=pzDNolTA5b10Df8zjsmGoha5rYoBePUBg+79uWcglI3Qd7SSAqQhkVnJtffBMvB2O3 9LmLnVQVA5nrH+xX4gvS2UZIjxV6nkWz7o+oQEYLqJmB9qr6WDAC6dsivR7ItHDfCZUN v/1ltKzNTXNctjYdwQMjA8AOZQCl6W3UeKWH/IR6GbsFaYyjhB0908LK5ikN+xzX9lNk A70KMyYL9VHEpLgviI+h5F3uHeH4SVgeWpCqruynPNhzQny5RhkCxYnwWoqKLvQWKwl+ cx/Xkl0ENZNHNsxIO5MLCeYfDCQ4qaULMI8MSJKiluYibvzQXe7WoE7OHbMK/V/HEfAJ dAcA== X-Gm-Message-State: AOJu0YyLZWqajDoj1TWrp3+eNquNR0VEzynXacIJm8HTIlrGf4TiQOMp kg5asDsmAhVFAqNeGZf9VIyjCRJUuByfw2T/VXZAAmQAZPdn/oWmrKhMgg== X-Gm-Gg: ASbGncvG3SGUXDSIykNF85y4EI8xzkg09zp/m/Wcd3N6axbBc482hEwK6DbDo15Bhls XX8XaTuMelQK2w9D9Rs4E8HVHmSZ+7SqWoYLYCQ+lJXrN0ACzyTcYDa/rHz/5IG0maGJ+vJ/85L 2YOPlm2YspFx5o+ZO1kWqNWJnyFvedNawn4CXHWumiyTIro2iY3F8dco60/k5op7w3odN9f4nlQ D0zSzrlCPjNM/5Vn0mbc09DsoKicaZgGOPGY+D8c//aKpAVVS8917u+p8f7CiISkUIe72GwIkVp kpixRo38Ju7QG9rDII1FlggQleR//gXPyFz+m9bwPnd1bbitiw== X-Google-Smtp-Source: AGHT+IHH8WSVns09t62ZGmp4rkGMaD4lgrzumqE1SmhWfpiPYr6D8cWmKGfm2OS/4TqQtKNk7nLtzw== X-Received: by 2002:a05:622a:181b:b0:471:8a7e:906b with SMTP id d75a77b69052e-471b061af98mr550391cf.17.1739302024776; Tue, 11 Feb 2025 11:27:04 -0800 (PST) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4719dab7aadsm18681601cf.51.2025.02.11.11.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 11:27:04 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 3/4] wiphy: clean up some spammy prints Date: Tue, 11 Feb 2025 11:26:55 -0800 Message-Id: <20250211192656.83157-3-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250211192656.83157-1-prestwoj@gmail.com> References: <20250211192656.83157-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 First, wiphy_select_akm is called multiple times for any connection so we shouldn't be printing in here as its redundant. Second, the external auth print was in a similar situation but this would even print when scanning, which really clouds the logs. --- src/wiphy.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/wiphy.c b/src/wiphy.c index 3d761251..c7df648a 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -245,10 +245,6 @@ static bool wiphy_can_connect_sae(struct wiphy *wiphy) return true; /* Case 3 */ - iwd_notice(IWD_NOTICE_CONNECT_INFO, - "FullMAC driver: %s using SAE. Expect EXTERNAL_AUTH", - wiphy->driver_str); - return true; } @@ -312,8 +308,6 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, * met, we can fallback to WPA2 (if the AKM is present). */ if (ie_rsne_is_wpa3_personal(info)) { - l_debug("Network is WPA3-Personal..."); - if (!wiphy_can_connect_sae(wiphy)) { l_debug("Can't use SAE, trying WPA2"); goto wpa2_personal; From patchwork Tue Feb 11 19:26:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13970541 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42F472690E5 for ; Tue, 11 Feb 2025 19:27:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302028; cv=none; b=JtWQEPx8pwLTqLcnpAUS0PqK7nOkgJciFbMch0bUZ3YXwj/d6OIC4+/pp6gU21nbUUVuGET4KQOXb21/192KyQcLSk+HFq1BcEsGDZVZZ00P577Z+1tDfXtBdbG8LnPZreMW2VyOJWxLKCL76Ct3iNvIbHhiYl3q8adJB2dpWGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739302028; c=relaxed/simple; bh=4cFaCZGk/mNUOHMz+1CjVC5YD8greqN2nSXGRn3l2Vc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sV1/ZTbGGy7dO+iwXGy6vG6IjVEsgONIpOFpd0SkV/C+O0m0jxjfpD933N1PjiPrNgAOTwgflhKp47dWD5TTRf5woA5WZfofg/cCdiDN/NsgAmNJ7pzPc0DKMnrfLbH/XZorH0NQhRqcBxrrXHE8JhUKZ5aEfRoSGax/XRCvcGk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IpR8u1Xh; arc=none smtp.client-ip=209.85.160.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IpR8u1Xh" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-47191bcb2afso19324791cf.2 for ; Tue, 11 Feb 2025 11:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739302026; x=1739906826; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bPcsjCWv5c/c8BcJz5XeSG7LjKcJh+rzqMCdB5oDJ60=; b=IpR8u1XhnxeY11nR8UIWKZH1cqkg4V/o4QRmj2bIH63D+NXhJ/sd8KzK6tgj5n+rRH tZQ5OovztidE3vWNRBCjcKDCTW1WUfYCPa+AMhzTOBcmwnU3SdKGpk6VdO/VBe47Wyb+ lEyuc72IkxjTck9QB1l9Pk9GbMCpe6RFlvzCVvlZGV79gjFdtsry8BUPhcrTPBNXDBXo y7QOa9qDi5+7wkTXDqErYvvP3eMkLdeGFsV+X45U3hPDdopp9y+VA56Lykf4FRYL1YAU EMFpIaOvL362tXb1oZIp3lB4j65kV+3LCxDHKtnBprI0vgMcgXRnu+/zf++nPqoQRN52 JGkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739302026; x=1739906826; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bPcsjCWv5c/c8BcJz5XeSG7LjKcJh+rzqMCdB5oDJ60=; b=Yoh+CK4rI7B3KWeLKUmczK+3KSovjxtKEVjS3VpLACGKxoI//Xkd82bI0/XKBpuZY2 eyssUbFNhroDKGOcbqPHdVaTdRqCRyCE3RhsKGrmsulITPI+0WFs2JL87OwiagyTSLDw 6C6JsLfPMRBboVs13t2kah2iDRE5TdnGdsoXOICutqoKjyD+/odb3hqV3M8rI36Pwju3 w+4hqwMR4cm7uE2f+Cy/12dHxlQx3qhJzCxy193qU0iNq0XSNjT8DUZ/ioggmV/MXyR6 +SwiZDzgNE3R/tUuOHcIGDqFs4jSX/4ISQ6/oeHiQHGLfhRZzuWdaZJqry/hYwa1SNxo fUfQ== X-Gm-Message-State: AOJu0YwZHQpjzWICodTlw8FJTSoyJSpyXuP1t0EI37H8W7R43w1juU2P Gvavrm+/wKxE0rnYfAh5r603iTASYkgkgccvjvnbGe13A61ZPcIW7SLxdQ== X-Gm-Gg: ASbGncvqlfFaVauVoVIsJhsP0VRJOWROdALt9sJA8/zDcCqw2cQfkSH9Opeq7pqOHkm kVZT8S0BFIJE5+r4KNfdZ2S92DuH+thWUwYdaG3IjgGioHox+IHUe1upzZNebN+ycduUkMs6/BS tRRzfjlNE6Q9x16pw9/zvODsI4QQipTqvr36Wt66vOWa6i4GIhCKxZObEaUTcrUsV44F1diVjcq DW3bp1dB3YE3tMQmQhZMWHKx1PxRlQu2nay7FG/ByCeiZGC/HvrF9814njAkGtWMvzjBlQ8CGtd F8cUzXbwW+cRcE+o8tw9meKD54iBBwtxD3Kdxlt+y5HjXUw54Q== X-Google-Smtp-Source: AGHT+IHGN5C3FZNsgEZ+ooY03kHW8PH8qeCSlkE18R7Cxu2kS5ghJ+sEG/Djj3MsXl3DUitRhieb/w== X-Received: by 2002:ac8:59ce:0:b0:471:9f06:aebe with SMTP id d75a77b69052e-471afedf725mr5731571cf.41.1739302025970; Tue, 11 Feb 2025 11:27:05 -0800 (PST) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4719dab7aadsm18681601cf.51.2025.02.11.11.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 11:27:05 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 4/4] station: print security of network when connecting Date: Tue, 11 Feb 2025 11:26:56 -0800 Message-Id: <20250211192656.83157-4-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250211192656.83157-1-prestwoj@gmail.com> References: <20250211192656.83157-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 After removing the debug log in wiphy_select_akm we still should log this information. Now it will just be logged once per connection attempt. --- src/station.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/station.c b/src/station.c index 5403c332..bb6debb9 100644 --- a/src/station.c +++ b/src/station.c @@ -3809,11 +3809,15 @@ int __station_connect_network(struct station *station, struct network *network, } iwd_notice(IWD_NOTICE_CONNECT_INFO, "ssid: %s, bss: "MAC", " - "signal: %d, load: %d/255", + "signal: %d, load: %d/255, " + "security: %s", network_get_ssid(network), MAC_STR(bss->addr), bss->signal_strength / 100, - bss->utilization); + bss->utilization, + diagnostic_akm_suite_to_security( + hs->akm_suite, + hs->wpa_ie)); station->connected_bss = bss; station->connected_network = network;