Linux v3.4-1622-g31a6710
This commit is contained in:
Josh Boyer
parent
9044bc6f85
commit
b906231683
File diff suppressed because it is too large
Load Diff
|
|
@ -1,155 +0,0 @@
|
|||
Path: news.gmane.org!not-for-mail
|
||||
From: Stanislav Yakovlev <stas.yakovlev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
|
||||
Newsgroups: gmane.linux.kernel.wireless.general
|
||||
Subject: [PATCH] net/wireless: ipw2x00: add supported cipher suites to wiphy initialization
|
||||
Date: Tue, 10 Apr 2012 21:44:47 -0400
|
||||
Lines: 97
|
||||
Approved: news@gmane.org
|
||||
Message-ID: <1334108687-12954-1-git-send-email-stas.yakovlev@gmail.com>
|
||||
NNTP-Posting-Host: plane.gmane.org
|
||||
X-Trace: dough.gmane.org 1334108469 22291 80.91.229.3 (11 Apr 2012 01:41:09 GMT)
|
||||
X-Complaints-To: usenet@dough.gmane.org
|
||||
NNTP-Posting-Date: Wed, 11 Apr 2012 01:41:09 +0000 (UTC)
|
||||
Cc: simar-hi6Y0CQ0nG0@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
|
||||
Stanislav Yakovlev <stas.yakovlev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
|
||||
To: linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org
|
||||
Original-X-From: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Apr 11 03:41:07 2012
|
||||
Return-path: <linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
|
||||
Envelope-to: glkwg-linux-wireless-wOFGN7rlS/M9smdsby/KFg@public.gmane.org
|
||||
Original-Received: from vger.kernel.org ([209.132.180.67])
|
||||
by plane.gmane.org with esmtp (Exim 4.69)
|
||||
(envelope-from <linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>)
|
||||
id 1SHmYV-0004IK-CT
|
||||
for glkwg-linux-wireless-wOFGN7rlS/M9smdsby/KFg@public.gmane.org; Wed, 11 Apr 2012 03:41:07 +0200
|
||||
Original-Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand
|
||||
id S1759898Ab2DKBlF (ORCPT
|
||||
<rfc822;glkwg-linux-wireless@m.gmane.org>);
|
||||
Tue, 10 Apr 2012 21:41:05 -0400
|
||||
Original-Received: from mail-ob0-f174.google.com ([209.85.214.174]:60108 "EHLO
|
||||
mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||
with ESMTP id S1753779Ab2DKBlE (ORCPT
|
||||
<rfc822;linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>);
|
||||
Tue, 10 Apr 2012 21:41:04 -0400
|
||||
Original-Received: by obbtb18 with SMTP id tb18so567970obb.19
|
||||
for <linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>; Tue, 10 Apr 2012 18:41:02 -0700 (PDT)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=gmail.com; s=20120113;
|
||||
h=from:to:cc:subject:date:message-id:x-mailer;
|
||||
bh=8+D+Uuo0bIOG6rz8vxd6TGAxmrbuAw2bjWhd058IjOQ=;
|
||||
b=beOgy1Y9ZAV1Xw5XqsnPDJ1Oc0qOpOo+gCWlwmWbLdVHxUVG+ZVuRW9eCRQkh+5bZm
|
||||
5Ic+xOISztYUJp144Fr4flnbGPRKKp7jP8qQ/HvCOo34J6MCgBlnuWNYKbn4/NUvOYAh
|
||||
SeHpk2D8yOHbiWAMV+JGTqGG+/N4jVvRL147Yg1IfNDAJd8Ahbl0wARLOVg8WGGTSPvn
|
||||
MU3HNbmKFFBDhnukYr4keCnjixuDkqPYGMYuDrsmKdiAFHBRDI6qudnvaqi8F8gbtaWg
|
||||
dfssdTbmNYM/R/PJenInoy7IbRps2iW9ZX+zFzydZWp2EyJ4EZkKrYKmnezQgNJzRVex
|
||||
KHfg==
|
||||
Original-Received: by 10.60.24.9 with SMTP id q9mr19071024oef.4.1334108462648;
|
||||
Tue, 10 Apr 2012 18:41:02 -0700 (PDT)
|
||||
Original-Received: from localhost.localdomain (50-0-191-227.dsl.static.sonic.net. [50.0.191.227])
|
||||
by mx.google.com with ESMTPS id tx2sm1309336obb.8.2012.04.10.18.40.54
|
||||
(version=TLSv1/SSLv3 cipher=OTHER);
|
||||
Tue, 10 Apr 2012 18:41:01 -0700 (PDT)
|
||||
X-Mailer: git-send-email 1.7.2.5
|
||||
Original-Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
|
||||
Precedence: bulk
|
||||
List-ID: <linux-wireless.vger.kernel.org>
|
||||
X-Mailing-List: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
|
||||
Xref: news.gmane.org gmane.linux.kernel.wireless.general:88613
|
||||
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel.wireless.general/88613>
|
||||
|
||||
Driver doesn't report its supported cipher suites through cfg80211
|
||||
interface. It still uses wext interface and probably will not work
|
||||
through nl80211, but will at least correctly advertise supported
|
||||
features.
|
||||
|
||||
Bug was reported by Omar Siam.
|
||||
https://bugzilla.kernel.org/show_bug.cgi?id=43049
|
||||
|
||||
Signed-off-by: Stanislav Yakovlev <stas.yakovlev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
|
||||
---
|
||||
drivers/net/wireless/ipw2x00/ipw.h | 23 +++++++++++++++++++++++
|
||||
drivers/net/wireless/ipw2x00/ipw2100.c | 4 ++++
|
||||
drivers/net/wireless/ipw2x00/ipw2200.c | 4 ++++
|
||||
3 files changed, 31 insertions(+), 0 deletions(-)
|
||||
create mode 100644 drivers/net/wireless/ipw2x00/ipw.h
|
||||
|
||||
diff --git a/drivers/net/wireless/ipw2x00/ipw.h b/drivers/net/wireless/ipw2x00/ipw.h
|
||||
new file mode 100644
|
||||
index 0000000..4007bf5
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/wireless/ipw2x00/ipw.h
|
||||
@@ -0,0 +1,23 @@
|
||||
+/*
|
||||
+ * Intel Pro/Wireless 2100, 2200BG, 2915ABG network connection driver
|
||||
+ *
|
||||
+ * Copyright 2012 Stanislav Yakovlev <stas.yakovlev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License version 2 as
|
||||
+ * published by the Free Software Foundation.
|
||||
+ */
|
||||
+
|
||||
+#ifndef __IPW_H__
|
||||
+#define __IPW_H__
|
||||
+
|
||||
+#include <linux/ieee80211.h>
|
||||
+
|
||||
+static const u32 ipw_cipher_suites[] = {
|
||||
+ WLAN_CIPHER_SUITE_WEP40,
|
||||
+ WLAN_CIPHER_SUITE_WEP104,
|
||||
+ WLAN_CIPHER_SUITE_TKIP,
|
||||
+ WLAN_CIPHER_SUITE_CCMP,
|
||||
+};
|
||||
+
|
||||
+#endif
|
||||
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
|
||||
index f0551f8..7c8e8b1 100644
|
||||
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
|
||||
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
|
||||
@@ -166,6 +166,7 @@ that only one external action is invoked at a time.
|
||||
#include <net/lib80211.h>
|
||||
|
||||
#include "ipw2100.h"
|
||||
+#include "ipw.h"
|
||||
|
||||
#define IPW2100_VERSION "git-1.2.2"
|
||||
|
||||
@@ -1946,6 +1947,9 @@ static int ipw2100_wdev_init(struct net_device *dev)
|
||||
wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = bg_band;
|
||||
}
|
||||
|
||||
+ wdev->wiphy->cipher_suites = ipw_cipher_suites;
|
||||
+ wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);
|
||||
+
|
||||
set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
|
||||
if (wiphy_register(wdev->wiphy)) {
|
||||
ipw2100_down(priv);
|
||||
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
|
||||
index 2b02257..bb4f42a 100644
|
||||
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
|
||||
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <net/cfg80211-wext.h>
|
||||
#include "ipw2200.h"
|
||||
+#include "ipw.h"
|
||||
|
||||
|
||||
#ifndef KBUILD_EXTMOD
|
||||
@@ -11533,6 +11534,9 @@ static int ipw_wdev_init(struct net_device *dev)
|
||||
wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = a_band;
|
||||
}
|
||||
|
||||
+ wdev->wiphy->cipher_suites = ipw_cipher_suites;
|
||||
+ wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);
|
||||
+
|
||||
set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
|
||||
|
||||
/* With that information in place, we can now register the wiphy... */
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
|
||||
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
|
||||
25
kernel.spec
25
kernel.spec
|
|
@ -6,7 +6,7 @@ Summary: The Linux kernel
|
|||
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
||||
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
||||
# be 0.
|
||||
%global released_kernel 1
|
||||
%global released_kernel 0
|
||||
|
||||
# Sign modules on x86. Make sure the config files match this setting if more
|
||||
# architectures are added.
|
||||
|
|
@ -95,7 +95,7 @@ Summary: The Linux kernel
|
|||
# The rc snapshot level
|
||||
%define rcrev 0
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
%define gitrev 1
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -751,15 +751,6 @@ Patch22000: weird-root-dentry-name-debug.patch
|
|||
#selinux ptrace child permissions
|
||||
Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
|
||||
|
||||
#rhbz 814278 814289 CVE-2012-2119
|
||||
Patch22007: macvtap-zerocopy-validate-vector-length.patch
|
||||
|
||||
#rhbz 817298
|
||||
Patch22013: ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
|
||||
|
||||
#rhbz 749276
|
||||
Patch22018: atl1c_net_next_update-3.4.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -1456,15 +1447,6 @@ ApplyPatch highbank-export-clock-functions.patch
|
|||
#vgaarb patches. blame mjg59
|
||||
ApplyPatch vgaarb-vga_default_device.patch
|
||||
|
||||
#rhbz 814278 814289 CVE-2012-2119
|
||||
ApplyPatch macvtap-zerocopy-validate-vector-length.patch
|
||||
|
||||
#rhbz 817298
|
||||
ApplyPatch ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
|
||||
|
||||
#rhbz 749276
|
||||
ApplyPatch atl1c_net_next_update-3.4.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -2335,6 +2317,9 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Mon May 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.5.0-0.rc0.git1.2
|
||||
- Linux v3.4-1622-g31a6710
|
||||
|
||||
* Mon May 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-2
|
||||
- Reenable debugging options.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
Currently we do not validate the vector length before calling
|
||||
get_user_pages_fast(), host stack would be easily overflowed by
|
||||
malicious guest driver who give us a descriptor with length greater
|
||||
than MAX_SKB_FRAGS. Solve this problem by checking the free entries
|
||||
before trying to pin user pages.
|
||||
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
drivers/net/macvtap.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
|
||||
index 7cb2684..d197a78 100644
|
||||
--- a/drivers/net/macvtap.c
|
||||
+++ b/drivers/net/macvtap.c
|
||||
@@ -527,6 +527,8 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
|
||||
}
|
||||
base = (unsigned long)from->iov_base + offset1;
|
||||
size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
|
||||
+ if (i + size >= MAX_SKB_FRAGS)
|
||||
+ return -EFAULT;
|
||||
num_pages = get_user_pages_fast(base, size, 0, &page[i]);
|
||||
if ((num_pages != size) ||
|
||||
(num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags))
|
||||
|
||||
Loading…
Reference in New Issue