aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mm: Hold a file reference in madvise_removeAndy Lutomirski2012-11-271-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | commit 9ab4233dd08036fe34a89c7dc6f47a8bf2eb29eb upstream. Otherwise the code races with munmap (causing a use-after-free of the vma) or with close (causing a use-after-free of the struct file). The bug was introduced by commit 90ed52ebe481 ("[PATCH] holepunch: fix mmap_sem i_mutex deadlock") [bwh: Backported to 3.2: - Adjust context - madvise_remove() calls vmtruncate_range(), not do_fallocate()] [luto: Backported to 3.0: Adjust context] Cc: Hugh Dickins <hugh@veritas.com> Cc: Miklos Szeredi <mszeredi@suse.cz> Cc: Badari Pulavarty <pbadari@us.ibm.com> Cc: Nick Piggin <npiggin@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Erik Gilling2012-11-267-19/+34
|\
| * Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2012-11-267-19/+34
| |\
| | * gpu: pvr: Update to DDK 1.8@2198402Alistair Strachan2012-11-267-19/+34
| | | | | | | | | | | | | | | | | | | | | - Implemented a DC API change which queues a dummy display flip to workaround a rare and difficult to reproduce synchronization deadlock. - Eliminate log spam from Linux shrinker integration.
* | | net: wireless: bcmdhd: Enable P2P probe request handling only during discoveryJithu Jance2012-11-164-4/+10
| | | | | | | | | | | | | | | Change-Id: I2db29d5ed7f66f2a45feb890c81d510fcad24dd2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Revert "net: wireless: bcmdhd: Fix WD wakelock behavior"Dmitry Shmidt2012-11-022-64/+8
| | | | | | | | | | | | This reverts commit 834029ac9d0ad8dea4e6a21bc34877dc3740b9f4.
* | | use clamp_t in UNAME26 fixKees Cook2012-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 31fd84b95eb211d5db460a1dda85e004800a7b52 upstream. The min/max call needed to have explicit types on some architectures (e.g. mn10300). Use clamp_t instead to avoid the warning: kernel/sys.c: In function 'override_release': kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default] Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | kernel/sys.c: fix stack memory content leak via UNAME26Kees Cook2012-11-011-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2702b1526c7278c4d65d78de209a465d4de2885e upstream. Calling uname() with the UNAME26 personality set allows a leak of kernel stack contents. This fixes it by defensively calculating the length of copy_to_user() call, making the len argument unsigned, and initializing the stack buffer to zero (now technically unneeded, but hey, overkill). CVE-2012-0957 Reported-by: PaX Team <pageexec@freemail.hu> Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Andi Kleen <ak@linux.intel.com> Cc: PaX Team <pageexec@freemail.hu> Cc: Brad Spengler <spender@grsecurity.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-10-245-12/+94
|\ \ \ | |/ /
| * | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-10-245-12/+94
| |\ \
| | * | net: wireless: bcmdhd: Fix WD wakelock behaviorDmitry Shmidt2012-10-242-8/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ebae2be248cbb4bc98e2b448641f65b77a320f4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Conflicts: drivers/net/wireless/bcmdhd/dhd_linux.c
| | * | net: wireless: bcmdhd: Fix BSSID report for disassocDmitry Shmidt2012-10-243-4/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: I5e3b01a1a471e5983ab934fc9d65802a389ab1af Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Todd Poynor2012-09-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2012-09-261-1/+1
| |\ \ \ | | |/ /
| | * | timekeeping: fix 32-bit overflow in get_monotonic_boottimeColin Cross2012-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_monotonic_boottime adds three nanonsecond values stored in longs, followed by an s64. If the long values are all close to 1e9 the first three additions can overflow and become negative when added to the s64. Cast the first value to s64 so that all additions are 64 bit. Change-Id: Ic996d8b6fbef0b72f2d027b0d8ef5259b5c1a540 Signed-off-by: Colin Cross <ccross@android.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-09-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-09-201-1/+1
| |\ \ \ | | |/ /
| | * | net: wireless: bcmdhd: Adjust roaming treshold to -65 dBDmitry Shmidt2012-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I88bb0cf759ee4262f31f054ef2dd5fc6258e8628 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-09-176-2/+51
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-09-176-2/+51
| |\ \ \ | | |/ /
| | * | net: wireless: bcmdhd: Add print when power-save mode is OFFDmitry Shmidt2012-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc72198b2d59c76dd45ba918cef982bcd7b570ab Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Update wifi stack ps state if was changedDmitry Shmidt2012-09-174-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1ee0b6ee05077d1ed6cfb578b6384dfc9787c81 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Conflicts: drivers/net/wireless/bcmdhd/wl_cfg80211.h
| | * | net: wireless: bcmdhd: Add ROAM setting per platform from MakefleDmitry Shmidt2012-09-133-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6bc3025e3641cb6b91022ab1c9976c0f6ad16a4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | input: mms_ts: max x/y are max coordinates, not the x/y sizeDima Zavin2012-09-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set max x/y to size - 1 Change-Id: I5bf99bfb45d5ae170049cc574694882e62194e60 Signed-off-by: Dima Zavin <dima@android.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-09-071-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-09-071-0/+1
| |\ \ \ | | |/ /
| | * | net: wireless: bcmdhd: Report proper mcs rate maskDmitry Shmidt2012-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting proper mcs rate mask allows to connect in 802.11n-only mode Change-Id: Iffd47a60c92a74d29e42d81d79fa64463f5895c5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Todd Poynor2012-08-283-3/+11
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2012-08-283-3/+11
| |\ \ \ | | |/ /
| | * | netfilter: xt_qtaguid: report only uid tags to non-privileged processesJP Abgrall2012-08-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past, a process could only see its own stats (uid-based summary, and details). Now we allow any process to see other UIDs uid-based stats, but still hide the detailed stats. Change-Id: I7666961ed244ac1d9359c339b048799e5db9facc Signed-off-by: JP Abgrall <jpa@google.com>
| | * | net: wireless: bcmdhd: Fix sending ctrl packetDmitry Shmidt2012-08-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Schedule dpc thread to send ctrl frame if we cannot send ctrl packet immediately. Change-Id: I5ae8b705a6ccddcc1f5c86b4c094342b57d26c7f Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Add ASSOC event processingDmitry Shmidt2012-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ide0b887ba52af56d0aaa415111df5ba16265c8d8 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-08-2716-86/+1040
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-08-2716-86/+1040
| |\ \ \ | | |/ /
| | * | net: wireless: bcmdhd: Update to version 5.90.195.104Dmitry Shmidt2012-08-279-78/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix p2p support for new wpa_supplicant - Propagate disconnect error code for cfg80211 Change-Id: I9643fbad7b6170b0e794fd7854201931d5eefb22 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | cfg80211: allow registering to beaconsJohannes Berg2012-08-244-1/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to register to received beacon frames to allow implementing OLBC logic in userspace. The registration is per wiphy since there's no point in receiving the same frame multiple times. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | nl80211: add API to probe a clientJohannes Berg2012-08-243-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the AP SME in hostapd is used it wants to probe the clients when they have been idle for some time. Add explicit API to support this. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | nl80211: allow subscribing to unexpected class3 framesJohannes Berg2012-08-245-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To implement AP mode without monitor interfaces we need to be able to send a deauth to stations that send frames without being associated. Enable this by adding a new nl80211 event for such frames that an application can subscribe to. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | nl80211: advertise device AP SMEJohannes Berg2012-08-244-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to advertise that the device contains the AP SME and what features it can support. There are currently no features in the bitmap -- probe response offload will be advertised by a few patches Arik is working on now (who took over from Guy Eilam) and a device with AP SME will typically implement and require response offload. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Conflicts: drivers/net/wireless/ath/ath6kl/init.c Change-Id: Ib1a65814860cf97cadd142c17be0e91f43743832
| | * | nl80211: advertise GTK rekey support, new triggersJohannes Berg2012-08-244-6/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now have the necessary API in place to support GTK rekeying, applications will need to know whether it is supported by a device. Add a pseudo-trigger that is used only to advertise that capability. Also, add some new triggers that match what iwlagn devices can do. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | nl80211: support sending TDLS commands/framesArik Nemtsov2012-08-243-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for sending high-level TDLS commands and TDLS frames via NL80211_CMD_TDLS_OPER and NL80211_CMD_TDLS_MGMT, respectively. Add appropriate cfg80211 callbacks for lower level drivers. Add wiphy capability flags for TDLS support and advertise them via nl80211. Signed-off-by: Arik Nemtsov <arik@wizery.com> Cc: Kalyan C Gaddam <chakkal@iit.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com> Conflicts: include/linux/nl80211.h include/net/cfg80211.h net/wireless/nl80211.c Change-Id: I08e4de6e92680aed35b98838aa999d31963b6d50
| | * | cfg80211/nl80211: Add PMKSA caching candidate eventJouni Malinen2012-08-245-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the driver (or most likely firmware) decides which AP to use for roaming based on internal scan result processing, user space needs to be notified of PMKSA caching candidates to allow RSN pre-authentication to be used. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Conflicts: include/linux/nl80211.h Change-Id: I31aa113747b75f5f35658b857fdfe8d9a75e4534
| | * | cfg80211/nl80211: support GTK rekey offloadJohannes Berg2012-08-245-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain circumstances, like WoWLAN scenarios, devices may implement (partial) GTK rekeying on the device to avoid waking up the host for it. In order to successfully go through GTK rekeying, the KEK, KCK and the replay counter are required. Add API to let the supplicant hand the parameters to the driver which may store it for future GTK rekey operations. Note that, of course, if GTK rekeying is done by the device, the EAP frame must not be passed up to userspace, instead a rekey event needs to be sent to let userspace update its replay counter. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Conflicts: include/linux/nl80211.h net/wireless/nl80211.c Change-Id: Icd3a157742b08c01a3be20d46d4112e5d4b93a58
| | * | net: wireless: bcmdhd: Remove WIPHY_FLAG_SUPPORTS_FW_ROAM flagDmitry Shmidt2012-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If driver advertises FW_ROAM, the supplicant wouldn't send the BSSID & Freq in the connect command allowing the driver to choose the AP to connect to. But unless we support ROAM_CACHE in firware this will delay the ASSOC as the FW need to do a full scan before attempting to connect. Change-Id: Iebc88a60243196b9ad27b8302f2b1473710308f6 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Remove PMKID_CACHE and TXFAIL events for CFG80211Dmitry Shmidt2012-08-221-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I82b6a1c9941485f3b47bc5978873379ab8853601 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-08-2217-81/+204
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-08-2217-81/+204
| |\ \ \ | | |/ /
| | * | net: wireless: bcmdhd: Update to Version 5.90.195.98Dmitry Shmidt2012-08-2217-81/+204
| | | | | | | | | | | | | | | | | | | | Change-Id: I2854300bc03b133d8276bea2f36f4c5253c551a1 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Todd Poynor2012-08-201-0/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2012-08-201-0/+9
| |\ \ \ | | |/ /
generated by cgit v1.1 at 2025-02-05 04:16:00 +0000