TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
f3a5c547012a09f38f7c27b17a8e3150b69cd259
ubports_kernel_google_msm/net/ipv4
History
James Morris f3a5c54701 Merge branch 'master' into next 
Conflicts:
	fs/cifs/misc.c

Merge to resolve above, per the patch below.

Signed-off-by: James Morris <jmorris@namei.org>

diff --cc fs/cifs/misc.c
index ec36410,addd1dc..0000000
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@@ -347,13 -338,13 +338,13 @@@ header_assemble(struct smb_hdr *buffer
  		/*  BB Add support for establishing new tCon and SMB Session  */
  		/*      with userid/password pairs found on the smb session   */
  		/*	for other target tcp/ip addresses 		BB    */
 -				if (current->fsuid != treeCon->ses->linux_uid) {
 +				if (current_fsuid() != treeCon->ses->linux_uid) {
  					cFYI(1, ("Multiuser mode and UID "
  						 "did not match tcon uid"));
- 					read_lock(&GlobalSMBSeslock);
- 					list_for_each(temp_item, &GlobalSMBSessionList) {
- 						ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList);
+ 					read_lock(&cifs_tcp_ses_lock);
+ 					list_for_each(temp_item, &treeCon->ses->server->smb_ses_list) {
+ 						ses = list_entry(temp_item, struct cifsSesInfo, smb_ses_list);
 -						if (ses->linux_uid == current->fsuid) {
 +						if (ses->linux_uid == current_fsuid()) {
  							if (ses->server == treeCon->ses->server) {
  								cFYI(1, ("found matching uid substitute right smb_uid"));
  								buffer->Uid = ses->Suid;
2008-11-18 18:52:37 +11:00
..
netfilter
CRED: Use creds in file structs
2008-11-14 10:39:25 +11:00
af_inet.c
ipv4: Allow binding to non-local addresses if IP_TRANSPARENT is set
2008-10-01 07:31:24 -07:00
ah4.c
…
arp.c
netfilter: replace old NF_ARP calls with NFPROTO_ARP
2008-10-20 03:34:51 -07:00
cipso_ipv4.c
cipso: unsigned buf_len cannot be negative
2008-10-29 15:55:53 -04:00
datagram.c
mib: add net to IP_INC_STATS_BH
2008-07-16 20:20:11 -07:00
devinet.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-17 08:58:52 -07:00
esp4.c
ipsec: Interfamily IPSec BEET
2008-08-06 02:39:30 -07:00
fib_frontend.c
netns: add namespace parameter to rt_cache_flush
2008-07-05 19:00:44 -07:00
fib_hash.c
netns: add namespace parameter to rt_cache_flush
2008-07-05 19:00:44 -07:00
fib_lookup.h
…
fib_rules.c
net: add fib_rules_ops to flush_cache method
2008-07-05 19:01:28 -07:00
fib_semantics.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-13 20:52:39 -07:00
fib_trie.c
proc: consolidate per-net single-release callers
2008-07-18 04:07:44 -07:00
icmp.c
net: Rationalise email address: Network Specific Parts
2008-10-13 19:01:08 -07:00
igmp.c
net: Rationalise email address: Network Specific Parts
2008-10-13 19:01:08 -07:00
inet_connection_sock.c
inet: cleanup of local_port_range
2008-10-08 14:18:04 -07:00
inet_diag.c
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
2008-10-16 15:24:51 -07:00
inet_fragment.c
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
inet_hashtables.c
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
inet_lro.c
net/inet_lro: remove setting skb->ip_summed when not LRO-able
2008-06-27 20:09:00 -07:00
inet_timewait_sock.c
ipv4: Implement IP_TRANSPARENT socket option
2008-10-01 07:30:02 -07:00
inetpeer.c
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
ip_forward.c
mib: add net to IP_INC_STATS_BH
2008-07-16 20:20:11 -07:00
ip_fragment.c
net: Rationalise email address: Network Specific Parts
2008-10-13 19:01:08 -07:00
ip_gre.c
gre: Initialise rtnl_link tunnel parameters properly
2008-10-11 12:20:15 -07:00
ip_input.c
net: shy netns_ok check
2008-11-12 23:23:51 -08:00
ip_options.c
cipso: Add support for native local labeling and fixup mapping names
2008-10-10 10:16:34 -04:00
ip_output.c
ipv4: Make Netfilter's ip_route_me_harder() non-local address compatible
2008-10-01 07:44:42 -07:00
ip_sockglue.c
ipv4: Implement IP_TRANSPARENT socket option
2008-10-01 07:30:02 -07:00
ipcomp.c
ipcomp: Fix warnings after ipcomp consolidation.
2008-07-27 03:59:24 -07:00
ipconfig.c
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ipip.c
net: Rationalise email address: Network Specific Parts
2008-10-13 19:01:08 -07:00
ipmr.c
net: Rationalise email address: Network Specific Parts
2008-10-13 19:01:08 -07:00
Kconfig
IPVS: Move IPVS to net/netfilter/ipvs
2008-10-07 08:38:24 +11:00
Makefile
IPVS: Move IPVS to net/netfilter/ipvs
2008-10-07 08:38:24 +11:00
netfilter.c
netfilter: netns: fix {ip,6}_route_me_harder() in netns
2008-10-08 11:35:03 +02:00
proc.c
net: fix /proc/net/snmp as memory corruptor
2008-11-10 21:43:08 -08:00
protocol.c
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
raw.c
mib: add net to IP_INC_STATS
2008-07-16 20:19:49 -07:00
route.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-17 08:58:52 -07:00
syncookies.c
tcp: Port redirection support for TCP
2008-10-01 07:46:49 -07:00
sysctl_net_ipv4.c
sysctl: simplify ->strategy
2008-10-16 11:21:47 -07:00
tcp_bic.c
…
tcp_cong.c
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
2008-10-16 15:24:51 -07:00
tcp_cubic.c
…
tcp_diag.c
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
tcp_highspeed.c
…
tcp_htcp.c
tcp_htcp: last_cong bug fix
2008-11-12 01:41:09 -08:00
tcp_hybla.c
tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd.
2008-10-07 15:58:17 -07:00
tcp_illinois.c
…
tcp_input.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-08 14:56:41 -07:00
tcp_ipv4.c
tcpv[46]: fix md5 pseudoheader address field ordering
2008-10-09 14:37:47 -07:00
tcp_lp.c
…
tcp_minisocks.c
tcp: kill pointless urg_mode
2008-10-07 14:43:06 -07:00
tcp_output.c
syncookies: fix inclusion of tcp options in syn-ack
2008-10-26 23:10:12 -07:00
tcp_probe.c
tcp: correct kcalloc usage
2008-07-10 16:51:32 -07:00
tcp_scalable.c
…
tcp_timer.c
net: wrap sk->sk_backlog_rcv()
2008-10-07 14:18:42 -07:00
tcp_vegas.c
…
tcp_vegas.h
…
tcp_veno.c
…
tcp_westwood.c
…
tcp_yeah.c
…
tcp.c
tcp: Fix recvmsg MSG_PEEK influence of blocking behavior.
2008-11-05 03:36:01 -08:00
tunnel4.c
[IPV4] TUNNEL4: Fix incoming packet length check for inter-protocol tunnel.
2008-06-05 04:02:33 +09:00
udp_impl.h
net: change proto destroy method to return void
2008-06-14 17:04:49 -07:00
udp.c
udp: multicast packets need to check namespace
2008-11-01 21:22:23 -07:00
udplite.c
mib: put udplite statistics on struct net
2008-07-18 04:03:45 -07:00
xfrm4_input.c
…
xfrm4_mode_beet.c
ipsec: Interfamily IPSec BEET
2008-08-06 02:39:30 -07:00
xfrm4_mode_transport.c
…
xfrm4_mode_tunnel.c
xfrm: fix fragmentation for ipv4 xfrm tunnel
2008-06-17 16:38:23 -07:00
xfrm4_output.c
…
xfrm4_policy.c
…
xfrm4_state.c
xfrm: Have af-specific init_tempsel() initialize family field of temporary selector
2008-11-04 14:49:19 -08:00
xfrm4_tunnel.c
…