[ 00/37] 3.2.28-stable review

August 16th, 2012 - 11:30 pm ET by Ben Hutchings | Report spam
This is the start of the stable review cycle for the 3.2.28 release.
There are 37 patches in this series, which will be posted as responses
to this one. If anyone has any issues with these being applied, please
let me know.

Responses should be made by Sun Aug 19 10:00:00 UTC 2012.
Anything received after that time might be too late.

A combined patch relative to 3.2.27 will be posted as an additional
response to this, and the diffstat can be found below.

Ben.

-
Makefile | 4 +-
arch/arm/configs/mxs_defconfig | 1 -
arch/arm/mach-pxa/raumfeld.c | 2 +-
arch/s390/kernel/compat_linux.c | 2 -
arch/s390/kernel/compat_wrapper.S | 4 +-
arch/x86/kvm/vmx.c | 1 +
drivers/gpu/drm/i915/i915_drv.h | 7 +--
drivers/gpu/drm/i915/i915_gem.c | 23 ++++++++
drivers/gpu/drm/i915/intel_ringbuffer.c | 31 ++++-
drivers/gpu/drm/radeon/evergreen.c | 71 ++++
drivers/gpu/drm/radeon/ni.c | 14 +++--
drivers/gpu/drm/radeon/radeon_asic.h | 8 +--
drivers/gpu/drm/radeon/rv515.c | 13 --
drivers/input/touchscreen/eeti_ts.c | 21 +++++
drivers/mfd/ezx-pcap.c | 2 +-
drivers/net/caif/caif_serial.c | 3 ++
drivers/net/ethernet/broadcom/bnx2.c | 6 +--
drivers/net/ethernet/intel/e1000/e1000_main.c | 10 ++--
drivers/net/ethernet/intel/e1000e/82571.c | 4 +-
drivers/net/tun.c | 7 +--
drivers/net/usb/kaweth.c | 2 +-
drivers/net/wireless/ath/ath9k/hw.c | 1 +
drivers/net/wireless/ath/ath9k/hw.h | 1 +
drivers/net/wireless/ath/ath9k/pci.c | 1 +
drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 13 +++--
drivers/net/wireless/rt2x00/rt61pci.c | 3 +-
drivers/net/wireless/rtlwifi/usb.c | 14 +++--
drivers/net/wireless/rtlwifi/wifi.h | 1 +
fs/hfsplus/wrapper.c | 2 +-
include/linux/input/eeti_ts.h | 1 +
include/linux/mfd/ezx-pcap.h | 1 +
net/caif/caif_dev.c | 2 +-
net/core/rtnetlink.c | 8 ++-
net/ipv4/cipso_ipv4.c | 6 ++-
net/ipv4/tcp.c | 5 +-
net/ipv4/tcp_input.c | 4 +-
net/mac80211/mesh.c | 1 +
net/sched/sch_sfb.c | 2 +
net/sctp/input.c | 7 +--
net/sctp/socket.c | 12 ++++-
net/wanrouter/wanmain.c | 51 ++++++++-
net/wireless/core.c | 5 ++
net/wireless/core.h | 1 +
net/wireless/util.c | 2 +-
sound/pci/hda/patch_conexant.c | 1 -
sound/pci/hda/patch_realtek.c | 7 ++-
46 files changed, 191 insertions(+), 197 deletions(-)

Ben Hutchings
I say we take off; nuke the site from orbit. It's the only way to be sure.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
email Follow the discussionReplies 42 repliesReplies Make a reply

Replies

#1 Ben Hutchings
August 16th, 2012 - 11:30 pm ET | Report spam
3.2-stable review patch. If anyone has any objections, please let me know.



From: Hangbin Liu

[ Upstream commit 42493570100b91ef663c4c6f0c0fdab238f9d3c2 ]

TCP_USER_TIMEOUT is a TCP level socket option that takes an unsigned int. But
patch "tcp: Add TCP_USER_TIMEOUT socket option"(dca43c75) didn't check the negative
values. If a user assign -1 to it, the socket will set successfully and wait
for 4294967295 miliseconds. This patch add a negative value check to avoid
this issue.

Signed-off-by: Hangbin Liu
Signed-off-by: David S. Miller
Signed-off-by: Ben Hutchings

net/ipv4/tcp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 11ba922..ad466a7 100644
a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2391,7 +2391,10 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
/* Cap the max timeout in ms TCP will retry/retrans
* before giving up and aborting (ETIMEDOUT) a connection.
*/
- icsk->icsk_user_timeout = msecs_to_jiffies(val);
+ if (val < 0)
+ err = -EINVAL;
+ else
+ icsk->icsk_user_timeout = msecs_to_jiffies(val);
break;
default:
err = -ENOPROTOOPT;


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Similar topics