Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (59 commits)
  igbvf.txt: Add igbvf Documentation
  igb.txt: Add igb documentation
  e100/e1000*/igb*/ixgb*: Add missing read memory barrier
  ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG
  netxen: protect tx timeout recovery by rtnl lock
  isdn: gigaset: use after free
  isdn: gigaset: add missing unlock
  solos-pci: Fix race condition in tasklet RX handling
  pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
  net: disable preemption before call smp_processor_id()
  tcp: no md5sig option size check bug
  iwlwifi: fix locking assertions
  iwlwifi: fix TX tracer
  isdn: fix information leak
  net: Fix napi_gro_frags vs netpoll path
  usbnet: remove noisy and hardly useful printk
  rtl8180: avoid potential NULL deref in rtl8180_beacon_work
  ath9k: Remove myself from the MAINTAINERS list
  libertas: scan before assocation if no BSSID was given
  libertas: fix association with some APs by using extended rates
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c
index 43c5dc3516e5..4cfdbe08ffd1 100644
--- a/drivers/isdn/sc/ioctl.c
+++ b/drivers/isdn/sc/ioctl.c
@@ -174,7 +174,7 @@ int sc_ioctl(int card, scs_ioctl *data)
                 pr_debug("%s: SCIOGETSPID: ioctl received\n",
                                 sc_adapter[card]->devicename);
 
-                spid = kmalloc(SCIOC_SPIDSIZE, GFP_KERNEL);
+                spid = kzalloc(SCIOC_SPIDSIZE, GFP_KERNEL);
                 if (!spid) {
                         kfree(rcvmsg);
                         return -ENOMEM;
@@ -194,7 +194,7 @@ int sc_ioctl(int card, scs_ioctl *data)
                         kfree(rcvmsg);
                         return status;
                 }
-                strcpy(spid, rcvmsg->msg_data.byte_array);
+                strlcpy(spid, rcvmsg->msg_data.byte_array, SCIOC_SPIDSIZE);
 
                 /*
                  * Package the switch type and send to user space
@@ -266,12 +266,12 @@ int sc_ioctl(int card, scs_ioctl *data)
                         return status;
                 }
 
-                dn = kmalloc(SCIOC_DNSIZE, GFP_KERNEL);
+                dn = kzalloc(SCIOC_DNSIZE, GFP_KERNEL);
                 if (!dn) {
                         kfree(rcvmsg);
                         return -ENOMEM;
                 }
-                strcpy(dn, rcvmsg->msg_data.byte_array);
+                strlcpy(dn, rcvmsg->msg_data.byte_array, SCIOC_DNSIZE);
                 kfree(rcvmsg);
 
                 /*
@@ -337,7 +337,7 @@ int sc_ioctl(int card, scs_ioctl *data)
                 pr_debug("%s: SCIOSTAT: ioctl received\n",
                                 sc_adapter[card]->devicename);
 
-                bi = kmalloc (sizeof(boardInfo), GFP_KERNEL);
+                bi = kzalloc(sizeof(boardInfo), GFP_KERNEL);
                 if (!bi) {
                         kfree(rcvmsg);
                         return -ENOMEM;