[Lucid][CVE-2013-7266] net: rework recvmsg handler msg_name and msg_namelen logic

Luis Henriques luis.henriques at canonical.com
Fri Jan 17 14:31:08 UTC 2014


Following this email, I'm sending CVE-2013-7266 fix backport for
Lucid.  It's a big one and deserves a good review.  I hope I got it
right :-)

Here's some notes:

- File changes not applicable:
  * crypto/algif_hash.c
  * crypto/algif_skcipher.c
  * net/bluetooth/sco.c
  * net/caif/caif_socket.c
  * net/nfc/llcp_sock.c
  * net/nfc/rawsock.c
  * net/vmw_vsock/af_vsock.c
  * net/vmw_vsock/vmci_transport.c

- Files renamed:
  * drivers/net/ppp/pppoe.c -> drivers/net/pppoe.c
  * net/l2tp/l2tp_ppp.c -> drivers/net/pppol2tp.c

- I've also squashed an additional change into rfcomm_sock_recvmsg()
  (net/bluetooth/rfcomm/sock.c).  This change seems to make sense in
  this commit (it is a removal of an extra 'msg->msg_namelen = 0;').
  It belongs to mainline commit 3d7d01d ("Bluetooth: Use common
  SOCK_STREAM receive code in RFCOMM"), which seems to be too
  intrusive to be backported.

Hannes Frederic Sowa (1):
  net: rework recvmsg handler msg_name and msg_namelen logic

 drivers/isdn/mISDN/socket.c  | 13 ++++---------
 drivers/net/pppoe.c          |  2 --
 drivers/net/pppol2tp.c       |  2 --
 include/linux/net.h          |  8 ++++++++
 net/appletalk/ddp.c          | 16 +++++++---------
 net/atm/common.c             |  2 --
 net/ax25/af_ax25.c           |  4 ++--
 net/bluetooth/af_bluetooth.c |  2 --
 net/bluetooth/hci_sock.c     |  2 --
 net/bluetooth/rfcomm/sock.c  |  3 ---
 net/compat.c                 |  3 ++-
 net/core/iovec.c             |  3 ++-
 net/ipx/af_ipx.c             |  3 +--
 net/irda/af_irda.c           |  4 ----
 net/iucv/af_iucv.c           |  2 --
 net/key/af_key.c             |  1 -
 net/llc/af_llc.c             |  2 --
 net/netlink/af_netlink.c     |  2 --
 net/netrom/af_netrom.c       |  3 +--
 net/packet/af_packet.c       | 32 +++++++++++++++-----------------
 net/rds/recv.c               |  2 --
 net/rose/af_rose.c           |  8 +++++---
 net/rxrpc/ar-recvmsg.c       |  9 ++++++---
 net/socket.c                 | 19 +++++++++++--------
 net/tipc/socket.c            |  6 ------
 net/unix/af_unix.c           |  5 -----
 net/x25/af_x25.c             |  3 +--
 27 files changed, 65 insertions(+), 96 deletions(-)

-- 
1.8.3.2




More information about the kernel-team mailing list