~ubuntu-branches/ubuntu/karmic/linux-ec2/karmic-updates

« back to all changes in this revision

Viewing changes to sound/core/seq/oss/seq_oss_init.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader, Stefan Bader, Upstream Kernel Changes, Ubuntu: 2.6.31-22.70
  • Date: 2010-12-01 11:17:04 UTC
  • mfrom: (7.2.7 karmic-security)
  • Revision ID: james.westby@ubuntu.com-20101201111704-pt5hbhkjlzpqq66a
Tags: 2.6.31-307.23
[ Stefan Bader ]

* Rebased to 2.6.31-22.70

[ Upstream Kernel Changes ]

* xen, compat: Test %rax for the syscall number, not %eax
  - CVE-2010-3301
* xen, compat: Retruncate rax after ia32 syscall entry tracing
  - CVE-2010-3301

[ Ubuntu: 2.6.31-22.70 ]

* Revert "SAUCE: AF_ECONET saddr->cookie prevent NULL pointer
  dereference"
* Revert "SAUCE: AF_ECONET SIOCSIFADDR ioctl does not check privileges"
* Revert "SAUCE: AF_ECONET prevent kernel stack overflow"
* Btrfs: fix checks in BTRFS_IOC_CLONE_RANGE
  - CVE-2010-2538
* xfs: validate untrusted inode numbers during lookup
  - CVE-2010-2943
* xfs: rename XFS_IGET_BULKSTAT to XFS_IGET_UNTRUSTED
  - CVE-2010-2943
* xfs: remove block number from inode lookup code
  - CVE-2010-2943
* xfs: fix untrusted inode number lookup
  - CVE-2010-2943
* drm/i915: Sanity check pread/pwrite
  - CVE-2010-2962
* drm/i915: Rephrase pwrite bounds checking to avoid any potential
  overflow
  - CVE-2010-2962
* tracing: Do not allow llseek to set_ftrace_filter
  - CVE-2010-3079
* drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack
  memory
  - CVE-2010-3296
* drivers/net/eql.c: prevent reading uninitialized stack memory
  - CVE-2010-3297
* drivers/net/usb/hso.c: prevent reading uninitialized memory
  - CVE-2010-3298
* setup_arg_pages: diagnose excessive argument size
  - CVE-2010-3858
* net: clear heap allocation for ETHTOOL_GRXCLSRLALL
  - CVE-2010-3861
* ipc: shm: fix information leak to userland
  - CVE-2010-4072
* econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
  - CVE-2010-3849
* econet: fix CVE-2010-3850
  - CVE-2010-3850
* econet: fix CVE-2010-3848
  - CVE-2010-3848

Show diffs side-by-side

added added

removed removed

Lines of Context:
280
280
        return 0;
281
281
 
282
282
 _error:
283
 
        snd_seq_oss_writeq_delete(dp->writeq);
284
 
        snd_seq_oss_readq_delete(dp->readq);
285
283
        snd_seq_oss_synth_cleanup(dp);
286
284
        snd_seq_oss_midi_cleanup(dp);
 
285
        delete_seq_queue(dp->queue);
287
286
        delete_port(dp);
288
 
        delete_seq_queue(dp->queue);
289
 
        kfree(dp);
290
287
 
291
288
        return rc;
292
289
}
349
346
static int
350
347
delete_port(struct seq_oss_devinfo *dp)
351
348
{
352
 
        if (dp->port < 0)
 
349
        if (dp->port < 0) {
 
350
                kfree(dp);
353
351
                return 0;
 
352
        }
354
353
 
355
354
        debug_printk(("delete_port %i\n", dp->port));
356
355
        return snd_seq_event_port_detach(dp->cseq, dp->port);