From: Greg Kroah-Hartman Date: Wed, 8 May 2013 23:01:39 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.9.2~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a7a93c786ce62264372cbb91723fc586b993e2f;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..7817075b0f6 --- /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 +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 + +commit 3f8a6411fbada1fa482276591e037f3b1adcf55b upstream. + +Addresses-Red-Hat-Bugzilla: #913245 + +Reported-by: Eric Sandeen +Signed-off-by: "Theodore Ts'o" +Reviewed-by: Carlos Maiolino +Signed-off-by: Lingzhu Xiang +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..87780061beb --- /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 +Date: Fri, 26 Apr 2013 13:49:32 +0000 +Subject: r8169: fix 8168evl frame padding. + +From: Stefan Bader + +commit e5195c1f31f399289347e043d6abf3ffa80f0005 upstream. + +Signed-off-by: Stefan Bader +Acked-by: Francois Romieu +Cc: hayeswang +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + 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 f6848280bfa..e4c1f404cfa 100644 --- 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