From patchwork Tue May 15 03:09:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10399841 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1D19B600D2 for ; Tue, 15 May 2018 03:10:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B916B28113 for ; Tue, 15 May 2018 03:10:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADEA128590; Tue, 15 May 2018 03:10:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 626AF28113 for ; Tue, 15 May 2018 03:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752057AbeEODKn (ORCPT ); Mon, 14 May 2018 23:10:43 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:44348 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbeEODKl (ORCPT ); Mon, 14 May 2018 23:10:41 -0400 Received: by mail-pg0-f65.google.com with SMTP id x145-v6so6333681pgx.11; Mon, 14 May 2018 20:10:41 -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:in-reply-to:references; bh=G9tlKbVq0EoFBHmECGUKcKYIh6hGJo0XvqilMNxwTG0=; b=k5fb3FrD6FmnGBlh9RUNULrLcAJLO3efniqjI5uCxMgF8Rpq947RsLdpC0wEoA8Ppj YbToc4XZ6ndhlv/4IjyimKzb3U/PWvdar7O3LRk0i/e/ZHmumfOXGlyACWZUVafSBdMY Z+CanN8PnB4wU8KIJxnwRPaqLOM6xo+YbPAK5QQzARc+Oz4nqRn8pW8S1S6idXouj9C2 LOoiYWLdCCsBaTslf6xs03pqEKwM1EB/rKr46VkOk9CJkcglWMQgIjwfaXc9l2LP6Tyv c31TLzKXiw984kHAzv/jsbmN9XNzmbJ2Hm7yKEWsswK3QY1XTcDJLEvGRsicC8CvWs4y v+UA== 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:in-reply-to :references; bh=G9tlKbVq0EoFBHmECGUKcKYIh6hGJo0XvqilMNxwTG0=; b=Lr+RZJPAL7F6yznrG26DJAYQzcPLa9Pflc777IY1Spj97bPZL8cJa1y+qxr40bw/Ve jHoRPsy+nre1802asiqGfYrA9XqZCm1V3fSlZ77Y/IdpAa+uZxo4wIrzffTFKqZSxtRw v/2igah93fBjZkEF47nMFllrs6oKK/P/TJt5FEB82nLlfcDyrCr1Ij3B8Lw5JPbOzdxq NQ1ohSgk3sKes68Is5+OCWT8QwBWZh9KbHyPozOajTF/vpHf9bQ9sTM29FS9e3Cn6GLt j7baWoKOl6SAGeykIUpWzSScS727/gFVxyFhwiYUzsjyRvsln2/hnrWMVs1UAehITGdT e5+A== X-Gm-Message-State: ALKqPweqlPUYodUkwlQyFBXWKnq5jQ3/7V1JZXZlvcIhjbyFKrZ6VK87 JVPkg70odYMtpP5QYo0PRT2skKOO X-Google-Smtp-Source: AB8JxZqmDn/QMRH805IZ28u8LAR6tk4d77pNHxqwd8c3xX+wKVr4kW9iXzrAoPzgmUEyaklNf2aqRg== X-Received: by 2002:a63:7311:: with SMTP id o17-v6mr10690742pgc.238.1526353841022; Mon, 14 May 2018 20:10:41 -0700 (PDT) Received: from sol.localdomain (c-67-185-97-198.hsd1.wa.comcast.net. [67.185.97.198]) by smtp.gmail.com with ESMTPSA id s68-v6sm1061167pgb.45.2018.05.14.20.10.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 20:10:40 -0700 (PDT) From: Eric Biggers To: linux-wireless@vger.kernel.org, Johannes Berg Cc: linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com, Eric Biggers Subject: [PATCH] cfg80211: further limit wiphy names to 64 bytes Date: Mon, 14 May 2018 20:09:24 -0700 Message-Id: <20180515030924.27570-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <1526300027.8070.0.camel@sipsolutions.net> References: <1526300027.8070.0.camel@sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers wiphy names were recently limited to 128 bytes by commit a7cfebcb7594 ("cfg80211: limit wiphy names to 128 bytes"). As it turns out though, this isn't sufficient because dev_vprintk_emit() needs the syslog header string "SUBSYSTEM=ieee80211\0DEVICE=+ieee80211:$devname" to fit into 128 bytes. This triggered the "device/subsystem name too long" WARN when the device name was >= 90 bytes. As before, this was reproduced by syzbot by sending an HWSIM_CMD_NEW_RADIO command to the MAC80211_HWSIM generic netlink family. Fix it by further limiting wiphy names to 64 bytes. Reported-by: syzbot+e64565577af34b3768dc@syzkaller.appspotmail.com Fixes: a7cfebcb7594 ("cfg80211: limit wiphy names to 128 bytes") Signed-off-by: Eric Biggers --- include/uapi/linux/nl80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 9c3630146cec0..271b93783d282 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -2698,7 +2698,7 @@ enum nl80211_attrs { #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS -#define NL80211_WIPHY_NAME_MAXLEN 128 +#define NL80211_WIPHY_NAME_MAXLEN 64 #define NL80211_MAX_SUPP_RATES 32 #define NL80211_MAX_SUPP_HT_RATES 77