Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750979AbWAQOu6 (ORCPT ); Tue, 17 Jan 2006 09:50:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750918AbWAQOuo (ORCPT ); Tue, 17 Jan 2006 09:50:44 -0500 Received: from e1.ny.us.ibm.com ([32.97.182.141]:24290 "EHLO e1.ny.us.ibm.com") by vger.kernel.org with ESMTP id S1750919AbWAQOua (ORCPT ); Tue, 17 Jan 2006 09:50:30 -0500 Message-Id: <20060117143325.562783000@sergelap> References: <20060117143258.150807000@sergelap> Date: Tue, 17 Jan 2006 08:33:07 -0600 From: Serge Hallyn To: linux-kernel@vger.kernel.org Cc: Hubertus Franke , Cedric Le Goater , Dave Hansen , Serge E Hallyn Subject: RFC [patch 09/34] PID Virtualization Change pid accesses: net/ Content-Disposition: inline; filename=B8-change-pid-tgid-references-net Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 11797 Lines: 305 Change pid accesses for net/. Signed-off-by: Dave Hansen Signed-off-by: Serge Hallyn --- core/pktgen.c | 4 ++-- core/rtnetlink.c | 3 ++- core/scm.c | 2 +- ipv4/devinet.c | 2 +- ipv4/fib_semantics.c | 2 +- ipv4/ipvs/ip_vs_sync.c | 6 +++--- ipv4/tcp.c | 2 +- ipv6/addrconf.c | 6 +++--- ipv6/ip6_flowlabel.c | 2 +- ipv6/route.c | 2 +- llc/af_llc.c | 2 +- netlink/af_netlink.c | 2 +- rxrpc/krxiod.c | 2 +- rxrpc/krxsecd.c | 2 +- rxrpc/krxtimod.c | 2 +- sunrpc/sched.c | 2 +- unix/af_unix.c | 6 +++--- 17 files changed, 25 insertions(+), 24 deletions(-) Index: linux-2.6.15/net/core/pktgen.c =================================================================== --- linux-2.6.15.orig/net/core/pktgen.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/core/pktgen.c 2006-01-17 08:37:01.000000000 -0500 @@ -2699,9 +2699,9 @@ t->control &= ~(T_STOP); t->control &= ~(T_REMDEV); - t->pid = current->pid; + t->pid = task_pid(current); - PG_DEBUG(printk("pktgen: starting pktgen/%d: pid=%d\n", cpu, current->pid)); + PG_DEBUG(printk("pktgen: starting pktgen/%d: pid=%d\n", cpu, task_pid(current))); max_before_softirq = t->max_before_softirq; Index: linux-2.6.15/net/core/rtnetlink.c =================================================================== --- linux-2.6.15.orig/net/core/rtnetlink.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/core/rtnetlink.c 2006-01-17 08:37:01.000000000 -0500 @@ -455,7 +455,8 @@ if (!skb) return; - if (rtnetlink_fill_ifinfo(skb, dev, type, current->pid, 0, change, 0) < 0) { + if (rtnetlink_fill_ifinfo(skb, dev, type, task_pid(current), + 0, change, 0) < 0) { kfree_skb(skb); return; } Index: linux-2.6.15/net/core/scm.c =================================================================== --- linux-2.6.15.orig/net/core/scm.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/core/scm.c 2006-01-17 08:37:01.000000000 -0500 @@ -41,7 +41,7 @@ static __inline__ int scm_check_creds(struct ucred *creds) { - if ((creds->pid == current->tgid || capable(CAP_SYS_ADMIN)) && + if ((creds->pid == task_tgid(current) || capable(CAP_SYS_ADMIN)) && ((creds->uid == current->uid || creds->uid == current->euid || creds->uid == current->suid) || capable(CAP_SETUID)) && ((creds->gid == current->gid || creds->gid == current->egid || Index: linux-2.6.15/net/ipv4/devinet.c =================================================================== --- linux-2.6.15.orig/net/ipv4/devinet.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/ipv4/devinet.c 2006-01-17 08:37:01.000000000 -0500 @@ -1133,7 +1133,7 @@ if (!skb) netlink_set_err(rtnl, 0, RTNLGRP_IPV4_IFADDR, ENOBUFS); - else if (inet_fill_ifaddr(skb, ifa, current->pid, 0, event, 0) < 0) { + else if (inet_fill_ifaddr(skb, ifa, task_pid(current), 0, event, 0) < 0) { kfree_skb(skb); netlink_set_err(rtnl, 0, RTNLGRP_IPV4_IFADDR, EINVAL); } else { Index: linux-2.6.15/net/ipv4/fib_semantics.c =================================================================== --- linux-2.6.15.orig/net/ipv4/fib_semantics.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/ipv4/fib_semantics.c 2006-01-17 08:37:01.000000000 -0500 @@ -1043,7 +1043,7 @@ } nl->nlmsg_flags = NLM_F_REQUEST; - nl->nlmsg_pid = current->pid; + nl->nlmsg_pid = task_pid(current); nl->nlmsg_seq = 0; nl->nlmsg_len = NLMSG_LENGTH(sizeof(*rtm)); if (cmd == SIOCDELRT) { Index: linux-2.6.15/net/ipv4/ipvs/ip_vs_sync.c =================================================================== --- linux-2.6.15.orig/net/ipv4/ipvs/ip_vs_sync.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/ipv4/ipvs/ip_vs_sync.c 2006-01-17 08:37:01.000000000 -0500 @@ -786,7 +786,7 @@ add_wait_queue(&sync_wait, &wait); - set_sync_pid(state, current->pid); + set_sync_pid(state, task_pid(current)); complete((struct completion *)startup); /* processing master/backup loop here */ @@ -841,7 +841,7 @@ (state == IP_VS_STATE_BACKUP && sync_backup_pid)) return -EEXIST; - IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, current->pid); + IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, task_pid(current)); IP_VS_DBG(7, "Each ip_vs_sync_conn entry need %Zd bytes\n", sizeof(struct ip_vs_sync_conn)); @@ -876,7 +876,7 @@ (state == IP_VS_STATE_BACKUP && !sync_backup_pid)) return -ESRCH; - IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, current->pid); + IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, task_pid(current)); IP_VS_INFO("stopping sync thread %d ...\n", (state == IP_VS_STATE_MASTER) ? sync_master_pid : sync_backup_pid); Index: linux-2.6.15/net/ipv4/tcp.c =================================================================== --- linux-2.6.15.orig/net/ipv4/tcp.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/ipv4/tcp.c 2006-01-17 08:37:01.000000000 -0500 @@ -1299,7 +1299,7 @@ if ((flags & MSG_PEEK) && peek_seq != tp->copied_seq) { if (net_ratelimit()) printk(KERN_DEBUG "TCP(%s:%d): Application bug, race in MSG_PEEK.\n", - current->comm, current->pid); + current->comm, task_pid(current)); peek_seq = tp->copied_seq; } continue; Index: linux-2.6.15/net/ipv6/addrconf.c =================================================================== --- linux-2.6.15.orig/net/ipv6/addrconf.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/ipv6/addrconf.c 2006-01-17 08:37:01.000000000 -0500 @@ -3097,7 +3097,7 @@ netlink_set_err(rtnl, 0, RTNLGRP_IPV6_IFADDR, ENOBUFS); return; } - if (inet6_fill_ifaddr(skb, ifa, current->pid, 0, event, 0) < 0) { + if (inet6_fill_ifaddr(skb, ifa, task_pid(current), 0, event, 0) < 0) { kfree_skb(skb); netlink_set_err(rtnl, 0, RTNLGRP_IPV6_IFADDR, EINVAL); return; @@ -3232,7 +3232,7 @@ netlink_set_err(rtnl, 0, RTNLGRP_IPV6_IFINFO, ENOBUFS); return; } - if (inet6_fill_ifinfo(skb, idev, current->pid, 0, event, 0) < 0) { + if (inet6_fill_ifinfo(skb, idev, task_pid(current), 0, event, 0) < 0) { kfree_skb(skb); netlink_set_err(rtnl, 0, RTNLGRP_IPV6_IFINFO, EINVAL); return; @@ -3292,7 +3292,7 @@ netlink_set_err(rtnl, 0, RTNLGRP_IPV6_PREFIX, ENOBUFS); return; } - if (inet6_fill_prefix(skb, idev, pinfo, current->pid, 0, event, 0) < 0) { + if (inet6_fill_prefix(skb, idev, pinfo, task_pid(current), 0, event, 0) < 0) { kfree_skb(skb); netlink_set_err(rtnl, 0, RTNLGRP_IPV6_PREFIX, EINVAL); return; Index: linux-2.6.15/net/ipv6/ip6_flowlabel.c =================================================================== --- linux-2.6.15.orig/net/ipv6/ip6_flowlabel.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/ipv6/ip6_flowlabel.c 2006-01-17 08:37:01.000000000 -0500 @@ -338,7 +338,7 @@ case IPV6_FL_S_ANY: break; case IPV6_FL_S_PROCESS: - fl->owner = current->pid; + fl->owner = task_pid(current); break; case IPV6_FL_S_USER: fl->owner = current->euid; Index: linux-2.6.15/net/ipv6/route.c =================================================================== --- linux-2.6.15.orig/net/ipv6/route.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/ipv6/route.c 2006-01-17 08:37:01.000000000 -0500 @@ -1843,7 +1843,7 @@ { struct sk_buff *skb; int size = NLMSG_SPACE(sizeof(struct rtmsg)+256); - u32 pid = current->pid; + u32 pid = task_pid(current); u32 seq = 0; if (req) Index: linux-2.6.15/net/netlink/af_netlink.c =================================================================== --- linux-2.6.15.orig/net/netlink/af_netlink.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/netlink/af_netlink.c 2006-01-17 08:37:01.000000000 -0500 @@ -476,7 +476,7 @@ struct hlist_head *head; struct sock *osk; struct hlist_node *node; - s32 pid = current->tgid; + s32 pid = task_tgid(current); int err; static s32 rover = -4097; Index: linux-2.6.15/net/rxrpc/krxiod.c =================================================================== --- linux-2.6.15.orig/net/rxrpc/krxiod.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/rxrpc/krxiod.c 2006-01-17 08:37:01.000000000 -0500 @@ -40,7 +40,7 @@ { DECLARE_WAITQUEUE(krxiod,current); - printk("Started krxiod %d\n",current->pid); + printk("Started krxiod %d\n",task_pid(current)); daemonize("krxiod"); Index: linux-2.6.15/net/rxrpc/krxsecd.c =================================================================== --- linux-2.6.15.orig/net/rxrpc/krxsecd.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/rxrpc/krxsecd.c 2006-01-17 08:37:01.000000000 -0500 @@ -53,7 +53,7 @@ int die; - printk("Started krxsecd %d\n", current->pid); + printk("Started krxsecd %d\n", task_pid(current)); daemonize("krxsecd"); Index: linux-2.6.15/net/rxrpc/krxtimod.c =================================================================== --- linux-2.6.15.orig/net/rxrpc/krxtimod.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/rxrpc/krxtimod.c 2006-01-17 08:37:01.000000000 -0500 @@ -68,7 +68,7 @@ rxrpc_timer_t *timer; - printk("Started krxtimod %d\n", current->pid); + printk("Started krxtimod %d\n", task_pid(current)); daemonize("krxtimod"); Index: linux-2.6.15/net/sunrpc/sched.c =================================================================== --- linux-2.6.15.orig/net/sunrpc/sched.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/sunrpc/sched.c 2006-01-17 08:37:01.000000000 -0500 @@ -792,7 +792,7 @@ spin_unlock(&rpc_sched_lock); dprintk("RPC: %4d new task procpid %d\n", task->tk_pid, - current->pid); + task_pid(current)); } static struct rpc_task * Index: linux-2.6.15/net/unix/af_unix.c =================================================================== --- linux-2.6.15.orig/net/unix/af_unix.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/unix/af_unix.c 2006-01-17 08:37:01.000000000 -0500 @@ -439,7 +439,7 @@ sk->sk_max_ack_backlog = backlog; sk->sk_state = TCP_LISTEN; /* set credentials so connect can copy them */ - sk->sk_peercred.pid = current->tgid; + sk->sk_peercred.pid = task_tgid(current); sk->sk_peercred.uid = current->euid; sk->sk_peercred.gid = current->egid; err = 0; @@ -1043,7 +1043,7 @@ unix_peer(newsk) = sk; newsk->sk_state = TCP_ESTABLISHED; newsk->sk_type = sk->sk_type; - newsk->sk_peercred.pid = current->tgid; + newsk->sk_peercred.pid = task_tgid(current); newsk->sk_peercred.uid = current->euid; newsk->sk_peercred.gid = current->egid; newu = unix_sk(newsk); @@ -1105,7 +1105,7 @@ sock_hold(skb); unix_peer(ska)=skb; unix_peer(skb)=ska; - ska->sk_peercred.pid = skb->sk_peercred.pid = current->tgid; + ska->sk_peercred.pid = skb->sk_peercred.pid = task_tgid(current); ska->sk_peercred.uid = skb->sk_peercred.uid = current->euid; ska->sk_peercred.gid = skb->sk_peercred.gid = current->egid; Index: linux-2.6.15/net/llc/af_llc.c =================================================================== --- linux-2.6.15.orig/net/llc/af_llc.c 2006-01-17 08:36:28.000000000 -0500 +++ linux-2.6.15/net/llc/af_llc.c 2006-01-17 08:37:01.000000000 -0500 @@ -760,7 +760,7 @@ if (net_ratelimit()) printk(KERN_DEBUG "LLC(%s:%d): Application " "bug, race in MSG_PEEK.\n", - current->comm, current->pid); + current->comm, task_pid(current)); peek_seq = llc->copied_seq; } continue; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/