3.4-stable patches

added patches:
	ext4-add-check-for-inodes_count-overflow-in-new-resize-ioctl.patch
	r8169-fix-8168evl-frame-padding.patch

diff --git a/queue-3.4/ext4-add-check-for-inodes_count-overflow-in-new-resize-ioctl.patch b/queue-3.4/ext4-add-check-for-inodes_count-overflow-in-new-resize-ioctl.patch
new file mode 100644 (file)
index 0000000..7817075
--- /dev/null
+++ b/queue-3.4/ext4-add-check-for-inodes_count-overflow-in-new-resize-ioctl.patch
@@ -0,0 +1,34 @@
+From 3f8a6411fbada1fa482276591e037f3b1adcf55b Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Sun, 21 Apr 2013 22:56:32 -0400
+Subject: ext4: add check for inodes_count overflow in new resize ioctl
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit 3f8a6411fbada1fa482276591e037f3b1adcf55b upstream.
+
+Addresses-Red-Hat-Bugzilla: #913245
+
+Reported-by: Eric Sandeen <sandeen@redhat.com>
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
+Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/ext4/resize.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/fs/ext4/resize.c
++++ b/fs/ext4/resize.c
+@@ -1630,6 +1630,10 @@ int ext4_resize_fs(struct super_block *s
+               return 0;
+ 
+       ext4_get_group_no_and_offset(sb, n_blocks_count - 1, &n_group, &offset);
++      if (n_group > (0xFFFFFFFFUL / EXT4_INODES_PER_GROUP(sb))) {
++              ext4_warning(sb, "resize would cause inodes_count overflow");
++              return -EINVAL;
++      }
+       ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset);
+ 
+       n_desc_blocks = (n_group + EXT4_DESC_PER_BLOCK(sb)) /

diff --git a/queue-3.4/r8169-fix-8168evl-frame-padding.patch b/queue-3.4/r8169-fix-8168evl-frame-padding.patch
new file mode 100644 (file)
index 0000000..8778006
--- /dev/null
+++ b/queue-3.4/r8169-fix-8168evl-frame-padding.patch
@@ -0,0 +1,44 @@
+From e5195c1f31f399289347e043d6abf3ffa80f0005 Mon Sep 17 00:00:00 2001
+From: Stefan Bader <stefan.bader@canonical.com>
+Date: Fri, 26 Apr 2013 13:49:32 +0000
+Subject: r8169: fix 8168evl frame padding.
+
+From: Stefan Bader <stefan.bader@canonical.com>
+
+commit e5195c1f31f399289347e043d6abf3ffa80f0005 upstream.
+
+Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
+Acked-by: Francois Romieu <romieu@fr.zoreil.com>
+Cc: hayeswang <hayeswang@realtek.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/realtek/r8169.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/drivers/net/ethernet/realtek/r8169.c
++++ b/drivers/net/ethernet/realtek/r8169.c
+@@ -5168,6 +5168,14 @@ static netdev_tx_t rtl8169_start_xmit(st
+               goto err_stop_0;
+       }
+ 
++      /* 8168evl does not automatically pad to minimum length. */
++      if (unlikely(tp->mac_version == RTL_GIGA_MAC_VER_34 &&
++                   skb->len < ETH_ZLEN)) {
++              if (skb_padto(skb, ETH_ZLEN))
++                      goto err_update_stats;
++              skb_put(skb, ETH_ZLEN - skb->len);
++      }
++
+       if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))
+               goto err_stop_0;
+ 
+@@ -5239,6 +5247,7 @@ err_dma_1:
+       rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
+ err_dma_0:
+       dev_kfree_skb(skb);
++err_update_stats:
+       dev->stats.tx_dropped++;
+       return NETDEV_TX_OK;
+ 

diff --git a/queue-3.4/series b/queue-3.4/series
index f6848280bfa43bae9255fc3b2ce3b6c4afe0f9d6..e4c1f404cfab57cbad55aa75a5b45a9e8488b5c0 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -6,3 +6,5 @@ perf-x86-intel-lbr-fix-lbr-filter.patch
 perf-x86-intel-lbr-demand-proper-privileges-for-perf_sample_branch_kernel.patch
 xhci-don-t-warn-on-empty-ring-for-suspended-devices.patch
 ipvs-ip_vs_sip_fill_param-bug-bad-check-of-return-value.patch
+ext4-add-check-for-inodes_count-overflow-in-new-resize-ioctl.patch
+r8169-fix-8168evl-frame-padding.patch