← 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/net/slip.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader, Stefan Bader, Upstream Kernel Changes
  • Date: 2008-08-14 10:11:31 UTC
  • Revision ID: james.westby@ubuntu.com-20080814101131-zq1nshdgm9dj9qbu
Tags: 2.6.22-15.58
https://launchpad.net/bugs/249340
[Stefan Bader]

* mm: Fix zero length segment loop
  - LP: #249340
  follow-up for CVE-2008-0598

[Upstream Kernel Changes]

* Fix compiler warning on 64-bit
  follow-up for CVE-2008-1673
* netfilter: nf_nat_snmp_basic: fix a range check in NAT for SNMP
  follow-up for CVE-2008-1673

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/slip.c
463
463
                        /* 20 sec timeout not reached */
464
464
                        goto out;
465
465
                }
466
 
                printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name,
467
 
                       (sl->tty->driver->chars_in_buffer(sl->tty) || sl->xleft) ?
468
 
                       "bad line quality" : "driver error");
 
466
                {
 
467
                        int cib = 0;
 
468
                        if (sl->tty->driver->chars_in_buffer)
 
469
                                cib = sl->tty->driver->chars_in_buffer(sl->tty);
 
470
                        printk(KERN_WARNING "%s: transmit timed out, %s?\n",
 
471
                                dev->name, (cib || sl->xleft) ?
 
472
                                       "bad line quality" : "driver error");
 
473
                }
469
474
                sl->xleft = 0;
470
475
                sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
471
476
                sl_unlock(sl);
836
841
 
837
842
        if(!capable(CAP_NET_ADMIN))
838
843
                return -EPERM;
 
844
        if (!tty->driver->write)
 
845
                return -EOPNOTSUPP;
839
846
 
840
847
        /* RTnetlink lock is misused here to serialize concurrent
841
848
           opens of slip channels. There are better ways, but it is