Linus Torvalds
94f2f14234
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ...
Pull user namespace and namespace infrastructure changes from Eric W Biederman:
"This set of changes starts with a few small enhnacements to the user
namespace. reboot support, allowing more arbitrary mappings, and
support for mounting devpts, ramfs, tmpfs, and mqueuefs as just the
user namespace root.
I do my best to document that if you care about limiting your
unprivileged users that when you have the user namespace support
enabled you will need to enable memory control groups.
There is a minor bug fix to prevent overflowing the stack if someone
creates way too many user namespaces.
The bulk of the changes are a continuation of the kuid/kgid push down
work through the filesystems. These changes make using uids and gids
typesafe which ensures that these filesystems are safe to use when
multiple user namespaces are in use. The filesystems converted for
3.9 are ceph, 9p, afs, ocfs2, gfs2, ncpfs, nfs, nfsd, and cifs. The
changes for these filesystems were a little more involved so I split
the changes into smaller hopefully obviously correct changes.
XFS is the only filesystem that remains. I was hoping I could get
that in this release so that user namespace support would be enabled
with an allyesconfig or an allmodconfig but it looks like the xfs
changes need another couple of days before it they are ready."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (93 commits)
cifs: Enable building with user namespaces enabled.
cifs: Convert struct cifs_ses to use a kuid_t and a kgid_t
cifs: Convert struct cifs_sb_info to use kuids and kgids
cifs: Modify struct smb_vol to use kuids and kgids
cifs: Convert struct cifsFileInfo to use a kuid
cifs: Convert struct cifs_fattr to use kuid and kgids
cifs: Convert struct tcon_link to use a kuid.
cifs: Modify struct cifs_unix_set_info_args to hold a kuid_t and a kgid_t
cifs: Convert from a kuid before printing current_fsuid
cifs: Use kuids and kgids SID to uid/gid mapping
cifs: Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID to keyring_alloc
cifs: Use BUILD_BUG_ON to validate uids and gids are the same size
cifs: Override unmappable incoming uids and gids
nfsd: Enable building with user namespaces enabled.
nfsd: Properly compare and initialize kuids and kgids
nfsd: Store ex_anon_uid and ex_anon_gid as kuids and kgids
nfsd: Modify nfsd4_cb_sec to use kuids and kgids
nfsd: Handle kuids and kgids in the nfs4acl to posix_acl conversion
nfsd: Convert nfsxdr to use kuids and kgids
nfsd: Convert nfs3xdr to use kuids and kgids
...
2013-02-25 16:00:49 -08:00
9p: Modify struct 9p_fid to use a kuid_t not a uid_t
2013-02-12 03:19:32 -08:00
Bluetooth: Keep track of UUID type upon addition
2013-02-01 15:50:17 -02:00
caif-hsi: Remove use of module parameters
2012-06-25 16:44:12 -07:00
treewide: Replace incomming with incoming in all comments and strings
2013-01-03 16:15:49 +01:00
af_iucv: add shutdown for HS transport
2012-03-07 22:52:24 -08:00
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
xfrm: make gc_thresh configurable in all namespaces
2013-02-06 11:36:29 +01:00
NFC: Initial Secure Element API
2013-01-10 00:51:54 +01:00
net: remove my future former mail address
2012-06-17 16:29:38 -07:00
net: sctp: remove unused multiple cookie keys
2013-02-12 16:05:11 -05:00
act_police: move struct tcf_police to act_police.c
2013-02-12 18:59:45 -05:00
ipv4: introduce address lifetime
2013-01-29 13:59:57 -05:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
unix: Remove unused field from unix_sock
2012-10-21 20:37:06 -04:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
userns: Convert net/ax25 to use kuid_t where appropriate
2012-08-14 21:49:42 -07:00
cfg80211: remove unused wext handler exports
2011-08-08 14:26:29 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-02-18 13:47:13 -05:00
net: core: add function for incremental IPv6 pseudo header checksum updates
2012-08-30 03:00:16 +02:00
cipso: handle CIPSO options correctly when NetLabel is disabled
2012-06-01 14:18:29 -04:00
net: Update args to dummy sock_update_classid().
2012-10-26 05:07:00 -04:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
dcb: Add stub routines for !CONFIG_DCB
2011-10-06 15:49:51 -04:00
net/dcb: Add an optional max rate attribute
2012-04-05 05:08:04 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
decnet: use correct RCU API to deref sk_dst_cache field
2013-01-28 00:15:27 -05:00
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -05:00
ipv6: Optimize ipv6_change_dsfield().
2013-01-09 23:59:53 -08:00
ipv6: fix race condition regarding dst->expires and dst->from.
2013-02-20 15:11:45 -05:00
net: Fix warnings in dst_ops.h
2012-07-19 10:43:03 -07:00
ipv4: Elide fib_validate_source() completely when possible.
2012-06-29 01:36:36 -07:00
ipv4: Add FLOWI_FLAG_KNOWN_NH
2012-10-08 17:42:36 -04:00
flow_dissector: use a 64bit load/store
2011-11-29 13:17:03 -05:00
garp: remove last synchronize_rcu() call
2011-05-12 17:46:56 -04:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
gro: Fix kcalloc argument order
2013-01-27 22:46:33 -05:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
mac80211: support (partial) VHT radiotap information
2012-11-27 11:56:18 +01:00
6LoWPAN: add fragmentation support
2011-11-14 00:19:42 -05:00
mac802154: declare reduced mlme operations
2012-05-16 15:16:56 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
ipv6: Add helper inet6_csk_update_pmtu().
2012-07-16 03:44:56 -07:00
soreuseport: TCP/IPv6 implementation
2013-01-23 13:44:01 -05:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock
2012-12-14 13:14:07 -05:00
tunnel: drop packet if ECN present with not-ECT
2012-09-27 18:12:37 -04:00
net: frag, move LRU list maintenance outside of rwlock
2013-01-29 13:36:24 -05:00
soreuseport: TCP/IPv4 implementation
2013-01-23 13:44:01 -05:00
net: move inet_dport/inet_num in sock_common
2012-11-30 15:02:56 -05:00
net: move inet_dport/inet_num in sock_common
2012-11-30 15:02:56 -05:00
ipv4: Maintain redirect and PMTU info in struct rtable again.
2012-07-10 22:40:14 -07:00
ipv4: Add a socket release callback for datagram sockets
2013-01-21 14:17:05 -05:00
ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library
2013-01-08 17:56:10 -08:00
ipv6: fix race condition regarding dst->expires and dst->from.
2013-02-20 15:11:45 -05:00
ipv6: Remove unused neigh argument for icmp6_dst_alloc() and its callers.
2013-01-18 14:41:13 -05:00
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
ipv4: add a fib_type to fib_info
2012-10-04 13:58:26 -04:00
ipvs: fix build errors related to config option combinations
2012-10-23 09:23:40 +09:00
net: convert __IPTUNNEL_XMIT() to an inline function
2012-11-14 18:49:50 -05:00
ipv6 flowlabel: Convert np->ipv6_fl_list to RCU.
2013-01-30 22:41:13 -05:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
lapb: Neaten debugging
2012-05-17 18:45:20 -04:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
mac80211: stop modifying HT SMPS capability
2013-02-15 09:41:41 +01:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
net/802: Implement Multiple Registration Protocol (MRP)
2013-02-10 20:37:22 -05:00
ndisc: Move ndisc_opt_addr_space() to include/net/ndisc.h.
2013-01-21 13:33:14 -05:00
net neighbour, decnet: Ensure to align device private data on preferred alignment.
2013-02-11 00:21:44 -05:00
proc: Usable inode numbers for the namespace file descriptors.
2012-11-20 04:19:49 -08:00
net: Kill ratelimit.h dependency in linux/net.h
2011-05-27 13:41:33 -04:00
ipv6 netevent: Remove old_neigh from netevent_redirect.
2013-01-14 15:04:59 -05:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netprio_cgroup: use cgroup->id instead of cgroup_netprio_state->prioidx
2012-11-22 07:32:47 -08:00
net: ping: fix build failure
2011-05-17 14:16:58 -04:00
pkt_sched: namespace aware act_mirred
2013-01-14 15:09:36 -05:00
sch_api: introduce qdisc_watchdog_schedule_ns()
2013-02-12 18:59:45 -05:00
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
net_sched: red: Make minor corrections to comments
2012-04-16 23:53:11 -04:00
regulatory: use RCU to protect last_request
2013-01-03 13:01:30 +01:00
tcp: better retrans tracking for defer-accept
2012-11-03 14:45:00 -04:00
rose: Add length checks to CALL_REQUEST parsing
2011-03-27 17:59:04 -07:00
ipv4: avoid a test in ip_rt_put()
2012-11-03 14:59:04 -04:00
rtnelink: remove unused parameter from rtnl_create_link().
2012-11-30 12:24:40 -05:00
sch: make htb_rate_cfg and functions around that generic
2013-02-12 18:59:45 -05:00
net: Remove unnecessary NULL check in scm_destroy().
2012-09-24 15:52:33 -04:00
tcp: add const qualifiers where possible
2011-10-21 05:22:42 -04:00
net: avoid reloads in SNMP_UPD_PO_STATS
2012-08-06 13:40:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net
2013-02-18 23:34:21 -05:00
tcp: remove Appropriate Byte Count support
2013-02-05 14:51:16 -05:00
cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
2012-04-10 10:04:07 -07:00
[PATCH] tcp: Cache inetpeer in timewait socket, and only when necessary.
2012-06-09 14:56:12 -07:00
ipv6: rename datagram_send_ctl and datagram_recv_ctl
2013-01-31 13:53:08 -05:00
net/ipv6/udp: UDP encapsulation: introduce encap_rcv hook into IPv6
2012-04-28 22:21:51 -04:00
net: ipv4: Standardize prefixes for message logging
2012-03-12 17:05:21 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-02-14 13:29:20 -05:00
94f2f14234