Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp2853408ybv; Sun, 9 Feb 2020 09:00:22 -0800 (PST) X-Google-Smtp-Source: APXvYqzBuUxUH+WNjctwwPIEWEhjGjO5b5FDLzaZlEf8FkKCIytkBRte/W3gcucO/E9lSNClmhaK X-Received: by 2002:a54:4006:: with SMTP id x6mr8373549oie.145.1581267622260; Sun, 09 Feb 2020 09:00:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581267622; cv=none; d=google.com; s=arc-20160816; b=lTYyQhRvZBQcJ20elqusKCmEZt0Ob0avmjLocHzEVreE7rMY6QVbTgcBw3+fbywcYT 6OOTX2gQw4oVLu/zm7yPCwprfaMqTInBXLWiw7xIeN6KekpQv5+UgKOMrtuz4cpr5+kj BMvEBVT0Omds+3LmbJ7vmkTKxk8m+1cqeDBB+GhBweVqiRwWq6ltq9+lFXAXf8ndSoNK 2CQZlz3uQG0ygUvUZTYSw40sImsYvA1Gd3oB9Q2bo0PF1LfmxrqTnHVonYbRyJWQ1xgf gbZ4ORY3xr/2tGjIlnqE7LOZQ8E6gMmFmol/fcCLZDdb8GMuBWTjHjzi86VY+Ei4Vi3P ErWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=wYnvxob4LDSS85k/oLAomCKv12c6qDtKzrXx5HtFjWE=; b=a/GyIdlfjzjkZjyuxwNupB8DYCgrUq2/S2OtEqIzmdJSOUIGrA3Uk1OlZIoVVKA6dl rYjfp4gF9gTJ8e6WnxbVMfEBVCPlUEkHzGGFCBR98lVGerlijLVIvSoaCSPUndOl/KGD 9rMxfFacDmJss3XFEubgX86EE5iDKZc+3x1TLV9bcrZeO6o8tlRpS3t0re8AB8/oVzHl D/oPnDf1zjSGHbZKjfp6bBXLwh8IyMurSPSWOt0lyb59WpGYtCEQjkskjdOX0/tWYuG+ ABjn6aPc8+sTtJmCadTWVuMIR3G9kMGVBk7cRD0QcyCdnRo7aH8smtXcNiOPxZToksof LWSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e22si7239750oiy.124.2020.02.09.09.00.12; Sun, 09 Feb 2020 09:00:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727840AbgBIQ7P (ORCPT + 99 others); Sun, 9 Feb 2020 11:59:15 -0500 Received: from smail.rz.tu-ilmenau.de ([141.24.186.67]:49169 "EHLO smail.rz.tu-ilmenau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727753AbgBIQ7P (ORCPT ); Sun, 9 Feb 2020 11:59:15 -0500 Received: from isengard.fritz.box (unknown [84.174.247.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smail.rz.tu-ilmenau.de (Postfix) with ESMTPSA id 77DFE580073; Sun, 9 Feb 2020 17:59:13 +0100 (CET) From: Markus Theil To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Markus Theil Subject: [PATCH 3/8] iw: scan: fix buffer over-read in operation class parsing Date: Sun, 9 Feb 2020 17:58:57 +0100 Message-Id: <20200209165902.44110-4-markus.theil@tu-ilmenau.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200209165902.44110-1-markus.theil@tu-ilmenau.de> References: <20200209165902.44110-1-markus.theil@tu-ilmenau.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Signed-off-by: Markus Theil --- scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scan.c b/scan.c index 14138ca..2d11f81 100644 --- a/scan.c +++ b/scan.c @@ -1507,7 +1507,7 @@ static void print_supp_op_classes(const uint8_t type, uint8_t len, printf("\n"); printf("\t\t * current operating class: %d\n", *p); - while (p++ < next_data) { + while (++p < next_data) { if (*p == 130) { one_hundred_thirty_delimiter = 1; break; @@ -1519,11 +1519,11 @@ static void print_supp_op_classes(const uint8_t type, uint8_t len, printf("\t\t * operating class: %d\n", *p); } if (one_hundred_thirty_delimiter) - while (p++ < next_data) { + while (++p < next_data) { printf("\t\t * current operating class extension: %d\n", *p); } if (zero_delimiter) - while (p++ < next_data - 1) { + while (++p < next_data - 1) { printf("\t\t * operating class duple: %d %d\n", p[0], p[1]); if (*p == 0) break; -- 2.25.0