rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

attempt to fix rhbz#604630

This commit is contained in:
Kyle McMartin 2010-09-03 15:59:58 -04:00
parent f0bdb962de
commit 867bebcea9
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -770,6 +770,7 @@ Patch12480: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
Patch12490: dell-wmi-add-support-for-eject-key.patch
Patch12500: irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
Patch12510: wireless-extensions-fix-kernel-heap-content-leak.patch
Patch12515: sanity-check-bond-proc_entry.patch
%endif
@ -1439,6 +1440,9 @@ ApplyPatch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
# cve-2010-2955
ApplyPatch wireless-extensions-fix-kernel-heap-content-leak.patch
# bz #604630
ApplyPatch sanity-check-bond-proc_entry.patch
# END OF PATCH APPLICATIONS
%endif
@ -2060,6 +2064,9 @@ fi
%changelog
* Fri Sep 03 2010 Kyle McMartin <kmcmartin@redhat.com> 2.6.34.6-52
- sanity-check-bond-proc_entry.patch (rhbz#604630)
* Fri Sep 03 2010 Kyle McMartin <kmcmartin@redhat.com> 2.6.34.6-51
- lirc_imon: move alloc before use (rhbz#629980)

13
sanity-check-bond-proc_entry.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0075514..136963b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3285,7 +3285,7 @@ static void bond_create_proc_entry(struct bonding *bond)
struct net_device *bond_dev = bond->dev;
struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
- if (bn->proc_dir) {
+ if (bn->proc_dir && !bond->proc_entry) {
bond->proc_entry = proc_create_data(bond_dev->name,
S_IRUGO, bn->proc_dir,
&bond_info_fops, bond);