← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/linux-source-2.6.22/gutsy-updates

« back to all changes in this revision

Viewing changes to drivers/isdn/i4l/isdn_net.c

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Amit Kucheria, Kees Cook, Tim Gardner, Upstream Kernel Changes
  • Date: 2008-01-28 13:46:21 UTC
  • Revision ID: james.westby@ubuntu.com-20080128134621-2g3o1x6zrnf4gf81
Tags: 2.6.22-14.51
https://launchpad.net/bugs/153096
https://launchpad.net/bugs/164231
https://launchpad.net/bugs/185649
[Amit Kucheria]

* Poulsbo: Mass update of all patches from moblin repo
* Update config.lpia to reflect new patches
* [sata_sil][sata->ide-bridg] failed to set xfermode
  - LP: #153096
* Poulsbo: remove extra patch

[Kees Cook]

* fix NFSv4 client mount regression
  - LP: #164231

[Tim Gardner]

* Support of new AMD PowerNow! (family 0x11 and beyond)
  - LP: #185649

[Upstream Kernel Changes]

* minixfs: limit minixfs printks on corrupted dir i_size (CVE-2006-6058)
* [JFFS2] Fix ACL vs. mode handling. (CVE-2007-4849)
* [IEEE80211]: avoid integer underflow for runt rx frames (CVE-2007-4997)
* [TCP]: Make sure write_queue_from does not begin with NULL ptr
  (CVE-2007-5501)
* wait_task_stopped: Check p->exit_state instead of TASK_TRACED
  (CVE-2007-5500)
* fix DLM regression
* CVE-2008-0001: Use access mode instead of open flags to determine
  needed permissions
* hrtimers: avoid overflow for large relative timeouts (CVE-2007-5966)
* isdn: avoid copying overly-long strings (CVE-2007-6063)
* I4L: fix isdn_ioctl memory overrun vulnerability (CVE-2007-6151)
* vfs: coredumping fix (CVE-2007-6206)
* tmpfs: restore missing clear_highpage (CVE-2007-6417)
* [UBUNTU] fs/dlm: Fix regression introduced with last security fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/isdn/i4l/isdn_net.c
2126
2126
        u_long flags;
2127
2127
        isdn_net_dev *p;
2128
2128
        isdn_net_phone *n;
2129
 
        char nr[32];
 
2129
        char nr[ISDN_MSNLEN];
2130
2130
        char *my_eaz;
2131
2131
 
2132
2132
        /* Search name in netdev-chain */
2135
2135
                nr[1] = '\0';
2136
2136
                printk(KERN_INFO "isdn_net: Incoming call without OAD, assuming '0'\n");
2137
2137
        } else
2138
 
                strcpy(nr, setup->phone);
 
2138
                strlcpy(nr, setup->phone, ISDN_MSNLEN);
2139
2139
        si1 = (int) setup->si1;
2140
2140
        si2 = (int) setup->si2;
2141
2141
        if (!setup->eazmsn[0]) {
2802
2802
                                chidx = -1;
2803
2803
                        }
2804
2804
                }
2805
 
                strcpy(lp->msn, cfg->eaz);
 
2805
                strlcpy(lp->msn, cfg->eaz, sizeof(lp->msn));
2806
2806
                lp->pre_device = drvidx;
2807
2807
                lp->pre_channel = chidx;
2808
2808
                lp->onhtime = cfg->onhtime;
2951
2951
        if (p) {
2952
2952
                if (!(n = kmalloc(sizeof(isdn_net_phone), GFP_KERNEL)))
2953
2953
                        return -ENOMEM;
2954
 
                strcpy(n->num, phone->phone);
 
2954
                strlcpy(n->num, phone->phone, sizeof(n->num));
2955
2955
                n->next = p->local->phone[phone->outgoing & 1];
2956
2956
                p->local->phone[phone->outgoing & 1] = n;
2957
2957
                return 0;