~sforshee/+git/ubuntu-precise:master

Last commit made on 2016-07-18
Get this branch:
git clone -b master https://git.launchpad.net/~sforshee/+git/ubuntu-precise
Only Seth Forshee can upload to this branch. If you are Seth Forshee please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~sforshee/+git/ubuntu-precise

Recent commits

b9b3a20... by Seth Forshee

UBUNTU: Ubuntu-3.2.0-107.148

Signed-off-by: Seth Forshee <email address hidden>

921c80e... by Kangjie Lu <email address hidden>

tipc: fix an infoleak in tipc_nl_compat_link_dump

link_info.str is a char array of size 60. Memory after the NULL
byte is not initialized. Sending the whole object out can cause
a leak.

Signed-off-by: Kangjie Lu <email address hidden>
Signed-off-by: David S. Miller <email address hidden>
(backported from commit 5d2be1422e02ccd697ccfcd45c85b4a26e6178e2)
[ luis:
  * change tipc_node_get_links() instead of tipc_nl_compat_link_dump()
    see 357ebdbfca0b ("tipc: convert legacy nl link dump to nl compat")
  * use strncpy() instead of nla_strlcpy() ]
CVE-2016-5243
BugLink: https://bugs.launchpad.net/bugs/1589036
Signed-off-by: Luis Henriques <email address hidden>
Acked-by: Brad Figg <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

cc1ee28... by Dan Carpenter <email address hidden>

KEYS: potential uninitialized variable

If __key_link_begin() failed then "edit" would be uninitialized. I've
added a check to fix that.

This allows a random user to crash the kernel, though it's quite
difficult to achieve. There are three ways it can be done as the user
would have to cause an error to occur in __key_link():

 (1) Cause the kernel to run out of memory. In practice, this is difficult
     to achieve without ENOMEM cropping up elsewhere and aborting the
     attempt.

 (2) Revoke the destination keyring between the keyring ID being looked up
     and it being tested for revocation. In practice, this is difficult to
     time correctly because the KEYCTL_REJECT function can only be used
     from the request-key upcall process. Further, users can only make use
     of what's in /sbin/request-key.conf, though this does including a
     rejection debugging test - which means that the destination keyring
     has to be the caller's session keyring in practice.

 (3) Have just enough key quota available to create a key, a new session
     keyring for the upcall and a link in the session keyring, but not then
     sufficient quota to create a link in the nominated destination keyring
     so that it fails with EDQUOT.

The bug can be triggered using option (3) above using something like the
following:

 echo 80 >/proc/sys/kernel/keys/root_maxbytes
 keyctl request2 user debug:fred negate @t

The above sets the quota to something much lower (80) to make the bug
easier to trigger, but this is dependent on the system. Note also that
the name of the keyring created contains a random number that may be
between 1 and 10 characters in size, so may throw the test off by
changing the amount of quota used.

Assuming the failure occurs, something like the following will be seen:

 kfree_debugcheck: out of range ptr 6b6b6b6b6b6b6b68h
 ------------[ cut here ]------------
 kernel BUG at ../mm/slab.c:2821!
 ...
 RIP: 0010:[<ffffffff811600f9>] kfree_debugcheck+0x20/0x25
 RSP: 0018:ffff8804014a7de8 EFLAGS: 00010092
 RAX: 0000000000000034 RBX: 6b6b6b6b6b6b6b68 RCX: 0000000000000000
 RDX: 0000000000040001 RSI: 00000000000000f6 RDI: 0000000000000300
 RBP: ffff8804014a7df0 R08: 0000000000000001 R09: 0000000000000000
 R10: ffff8804014a7e68 R11: 0000000000000054 R12: 0000000000000202
 R13: ffffffff81318a66 R14: 0000000000000000 R15: 0000000000000001
 ...
 Call Trace:
   kfree+0xde/0x1bc
   assoc_array_cancel_edit+0x1f/0x36
   __key_link_end+0x55/0x63
   key_reject_and_link+0x124/0x155
   keyctl_reject_key+0xb6/0xe0
   keyctl_negate_key+0x10/0x12
   SyS_keyctl+0x9f/0xe7
   do_syscall_64+0x63/0x13a
   entry_SYSCALL64_slow_path+0x25/0x25

Fixes: f70e2e06196a ('KEYS: Do preallocation for __key_link()')
Signed-off-by: Dan Carpenter <email address hidden>
Signed-off-by: David Howells <email address hidden>
cc: <email address hidden>
Signed-off-by: Linus Torvalds <email address hidden>
(backported from commit 38327424b40bcebe2de92d07312c89360ac9229a)
[ luis: adjusted context ]
CVE-2016-4470
Signed-off-by: Luis Henriques <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Acked-by: Brad Figg <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

8e75243... by Ursula Braun <email address hidden>

qeth: delete napi struct when removing a qeth device

BugLink: http://bugs.launchpad.net/bugs/1601831

A qeth_card contains a napi_struct linked to the net_device during
device probing. This struct must be deleted when removing the qeth
device, otherwise Panic on oops can occur when qeth devices are
repeatedly removed and added.

Fixes: a1c3ed4c9ca ("qeth: NAPI support for l2 and l3 discipline")
Cc: <email address hidden> # v2.6.37+
Signed-off-by: Ursula Braun <email address hidden>
Tested-by: Alexander Klein <email address hidden>
Signed-off-by: David S. Miller <email address hidden>
(cherry picked from commit 7831b4ff0d926e0deeaabef9db8800ed069a2757)
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Christopher Arges <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

57ddd53... by Andy Whitcroft

UBUNTU: [Debian] git-ubuntu-log -- git log output is UTF-8

BugLink: http://bugs.launchpad.net/bugs/1599562

Signed-off-by: Andy Whitcroft <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

19227c7... by Andy Whitcroft

UBUNTU: [Debian] git-ubuntu-log -- prevent bug references being split

BugLink: http://bugs.launchpad.net/bugs/1599562

Signed-off-by: Andy Whitcroft <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

94f03ad... by Andy Whitcroft

UBUNTU: [Debian] git-ubuntu-log -- ensure we get the last commit

BugLink: http://bugs.launchpad.net/bugs/1599562

Signed-off-by: Andy Whitcroft <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

effa405... by Andy Whitcroft

UBUNTU: [Debian] git-ubuntu-log -- wrap long bug and commit titles

BugLink: http://bugs.launchpad.net/bugs/1599562

Signed-off-by: Andy Whitcroft <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

943c918... by Andy Whitcroft

UBUNTU: [Debian] git-ubuntu-log -- handle invalid or private bugs

BugLink: http://bugs.launchpad.net/bugs/1599562

Signed-off-by: Andy Whitcroft <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

ab9459e... by Andy Whitcroft

UBUNTU: [Debian] git-ubuntu-log -- output should be utf-8

BugLink: http://bugs.launchpad.net/bugs/1599562

Signed-off-by: Andy Whitcroft <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>