From patchwork Wed Mar 18 09:58:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ouden Lin X-Patchwork-Id: 1257389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=QVjPMsHf; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=oilahq7e; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48j5B20jZBz9sQx for ; Wed, 18 Mar 2020 20:59:54 +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: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:In-Reply-To:References: List-Owner; bh=OnXS/cU+Te4iaCsWptkdO0nc32EZlwzejDx+D1nuTV4=; b=QVjPMsHfbZLG/5 cwUoypDW64COklHwA2W6H/I3O+e9f+jzHKcB8fwyI7RXjsQf96USFGsrpZVNKBCgvJgy5fdtkE3J9 ZHhWWUny4WnnwjT8ukRlMDlO6VlT+pyY3S89c7e5/EmMH/PQ1yY/HJURCfIJ72yMynEEOU9YUI/fi UKhmkqhSZ22d90rXmpyk1O5sPOSIxr0GiIO7TJWuo7VVyk1iMqFy4rZY3sj4TAxBTLpvgGl8X59qP p/EOGRNFt3VvpVwJCv5aoTC5G9HCkZoOZSaeGOBedsvMy+iRXPFEIND6HZI5MtBLjFWPC8t0s/Bxz RLqvbWzbm97OueuTtSHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEVU7-0007sX-Kk; Wed, 18 Mar 2020 09:59:35 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEVU4-0007ry-2I for hostap@lists.infradead.org; Wed, 18 Mar 2020 09:59:33 +0000 Received: by mail-pf1-x441.google.com with SMTP id b72so13612643pfb.11 for ; Wed, 18 Mar 2020 02:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P435QBbmDT4PdWlvyval0VguP+ED4/zN1l85A7M5iHI=; b=oilahq7eRNKCB2Xn7FmuF98UgrQpfTQ2/0UrecNbtU2q+qtFylvg+AeK4tbeOYvgBo vMZOXKkg1d2b+GMYb5fox1lN1wpHjfO16G0ev2aBFL0le/bfWfT7QvzXzyU+J1LT9KXE /o5H1/teSBJEuzXjdZ9c/ls5wXZbb2ce85jXumPKjSJ/APfv5UbSm862LDeXm+6UuJd1 UrBPwVWEuNwPKZj9Wslz8LxyDUu4qMDfoSU8JYFEeR7u58kGPkD/tgwjJxRR18Kp18P0 Kcq03DRGw1RGkqU6Vdy6gOAHz8SrVXebbJ0LSM/tVwuIRrdC5w0xuSz/PpQ5CgzYlvAh aq4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P435QBbmDT4PdWlvyval0VguP+ED4/zN1l85A7M5iHI=; b=MFoYwTqlAllxzgkDRHo6T5fxo0jsPRgtlzjmLK215V8/OlVudJAJC0dyzA2U3nWxuT scCMUl05z8v+RD7LA5dAufi80wiZ4U0AlVCrZzyzp0yCJTfHiydUoueVC4Jdb0ey2w+y dJDHvPTeBpXAvjsVRyqh3VWB0XdbTBiP84DUuzURgTdv782TWyWpijzC7sjt8/xC079A 3E2vnJ091eq5xhrEA0YfPU5VRviTi+gCRYYOJChNU/HGVBo2KKD6/qa2maTd9/SmcfPH PuZYbJ3kGupSsXMzQtuWR7WoUKiKbIkxMGLOcGWfpWYgHEqLbs2VamcJNwB6onx7Ddo7 3DOQ== X-Gm-Message-State: ANhLgQ2e83gWgikp+BTN9452fLERnZqy3VywrA7tUoSJJt1VeqCYCP8m pcRGIDKafodlg+/KN1r6UoHM5uUI X-Google-Smtp-Source: ADFU+vvqUUG8gP8JEzXbuk902aWGtJiL2Jqaq5qTw2UQYrE/AhkwuB3ZKnCyQkqtpHaQMLvgEdqQbQ== X-Received: by 2002:a63:4864:: with SMTP id x36mr3487385pgk.398.1584525570648; Wed, 18 Mar 2020 02:59:30 -0700 (PDT) Received: from localhost.localdomain (1-171-1-10.dynamic-ip.hinet.net. [1.171.1.10]) by smtp.gmail.com with ESMTPSA id h23sm5926407pfo.220.2020.03.18.02.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2020 02:59:29 -0700 (PDT) From: Ouden Lin X-Google-Original-From: Ouden Lin To: hostap@lists.infradead.org Subject: [PATCH] nl80211: Fix RTM NEW/DELLINK IFNAME copy Date: Wed, 18 Mar 2020 17:58:37 +0800 Message-Id: <20200318095836.30859-1-ouden.lin@realtek.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200318_025932_109818_73084EAD X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [ouden.biz[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ouden Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ouden If the kernel rtm_newlink or rtm_dellink send the max length of IFNAME, then the ifname will not copy from RTA_DATA (IFLA_IFNAME) in function wpa_driver_nl80211_event_rtm_addlink () and wpa_driver_nl80211_event_rtm_dellink (). Because the RTA_PAYLOAD (IFLA_IFNAME) length already include the NULL terminaled, that equal the IFNAMSIZ. This patch will fixed the condition when IFNAME reach max size. Signed-off-by: Ouden --- src/drivers/driver_nl80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index efcd69ad2..c071cc0e0 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -1047,7 +1047,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, while (RTA_OK(attr, attrlen)) { switch (attr->rta_type) { case IFLA_IFNAME: - if (RTA_PAYLOAD(attr) >= IFNAMSIZ) + if (RTA_PAYLOAD(attr) > IFNAMSIZ) break; os_memcpy(ifname, RTA_DATA(attr), RTA_PAYLOAD(attr)); ifname[RTA_PAYLOAD(attr)] = '\0'; @@ -1222,7 +1222,7 @@ static void wpa_driver_nl80211_event_rtm_dellink(void *ctx, while (RTA_OK(attr, attrlen)) { switch (attr->rta_type) { case IFLA_IFNAME: - if (RTA_PAYLOAD(attr) >= IFNAMSIZ) + if (RTA_PAYLOAD(attr) > IFNAMSIZ) break; os_memcpy(ifname, RTA_DATA(attr), RTA_PAYLOAD(attr)); ifname[RTA_PAYLOAD(attr)] = '\0';