X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=dummynet%2Fipfw2_mod.c;h=ee4eebac8a464bf5872af1620914bba0a1e56c02;hb=f1a44f1ebacf274e0f35970bfc8ee5aa07aa9aca;hp=b072ab507b518fd144956d183c461e1c088adde4;hpb=6c2e192c3237bd46db6ad4230fed71d28f362331;p=ipfw.git diff --git a/dummynet/ipfw2_mod.c b/dummynet/ipfw2_mod.c index b072ab5..ee4eeba 100644 --- a/dummynet/ipfw2_mod.c +++ b/dummynet/ipfw2_mod.c @@ -156,7 +156,7 @@ fini_children(void) mods[i].mod->evhand(NULL, MOD_UNLOAD, mods[i].mod->priv); } } -/*--- end of module bindinghelper functions ---*/ +/*--- end of module binding helper functions ---*/ /*--- * Control hooks: @@ -256,18 +256,18 @@ static struct nf_sockopt_ops ipfw_sockopts = { * - the hook names change between macros (NF_IP*) and enum NF_INET_* * * - the second argument to the netfilter hook is - * struct sk_buff ** in kernels <= 2.6.22 - * struct sk_buff * in kernels > 2.6.22 + * struct sk_buff ** in kernels <= 2.6.22 + * struct sk_buff * in kernels > 2.6.22 * * - NF_STOP is not defined before 2.6 so we remap it to NF_ACCEPT * * - the packet descriptor passed to the queue handler is - * struct nf_info in kernels <= 2.6.24 - * struct nf_queue_entry in kernels <= 2.6.24 + * struct nf_info in kernels <= 2.6.24 + * struct nf_queue_entry in kernels <= 2.6.24 * * - the arguments to the queue handler also change; */ - + /* * declare hook to grab packets from the netfilter interface. * The NF_* names change in different versions of linux, in some @@ -464,15 +464,15 @@ ip_output(struct mbuf *m, struct mbuf __unused *opt, * * The chain is the following * sk_buff* sock* socket* file* - * skb -> sk ->sk_socket->file ->f_owner ->pid - * skb -> sk ->sk_socket->file ->f_uid (direct) - * skb -> sk ->sk_socket->file ->f_cred->fsuid (2.6.29+) + * skb -> sk ->sk_socket->file ->f_owner ->pid + * skb -> sk ->sk_socket->file ->f_uid (direct) + * skb -> sk ->sk_socket->file ->f_cred->fsuid (2.6.29+) * * Related headers: - * linux/skbuff.h struct skbuff - * net/sock.h struct sock - * linux/net.h struct socket - * linux/fs.h struct file + * linux/skbuff.h struct skbuff + * net/sock.h struct sock + * linux/net.h struct socket + * linux/fs.h struct file * * With vserver we may have sk->sk_xid and sk->sk_nid that * which we store in fw_groups[1] (matches O_JAIL) and fw_groups[2] @@ -490,10 +490,9 @@ linux_lookup(const int proto, const __be32 saddr, const __be16 sport, { struct sock *sk; int ret = -1; /* default return value */ - int uid = -1; /* user id */ int st = -1; /* state */ - if (proto != IPPROTO_TCP) + if (proto != IPPROTO_TCP) /* XXX extend for UDP */ return -1; if ((dir ? (void *)skb->dst : (void *)skb->dev) == NULL) { @@ -501,50 +500,55 @@ linux_lookup(const int proto, const __be32 saddr, const __be16 sport, return -1; } - /* - * inet_lookup above 2.6.24 has an additional 'net' parameter - * so we use a macro to conditionally supply it. - * Also we need to switch dst and src depending on the direction. - */ + if (skb->sk) { + sk = skb->sk; + } else { + /* + * Try a lookup. On a match, sk has a refcount that we must + * release on exit (we know it because skb->sk = NULL). + * + * inet_lookup above 2.6.24 has an additional 'net' parameter + * so we use a macro to conditionally supply it. + * swap dst and src depending on the direction. + */ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24) #define _OPT_NET_ARG #else #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) /* there is no dev_net() on 2.6.25 */ #define _OPT_NET_ARG (skb->dev->nd_net), -#else /* 2.6.26 and above */ +#else /* 2.6.26 and above */ #define _OPT_NET_ARG dev_net(skb->dev), #endif #endif - - if (0 && skb->sk) { - sk=skb->sk; - } else { - sk = (dir) ? - inet_lookup(_OPT_NET_ARG &tcp_hashinfo, - daddr, dport, saddr, sport, // matches outgoing for server sockets + sk = (dir) ? /* dir != 0 on output */ + inet_lookup(_OPT_NET_ARG &tcp_hashinfo, + daddr, dport, saddr, sport, // match outgoing inet_iif(skb)) : - inet_lookup(_OPT_NET_ARG &tcp_hashinfo, - saddr, sport, daddr, dport, // matches incoming for server sockets + inet_lookup(_OPT_NET_ARG &tcp_hashinfo, + saddr, sport, daddr, dport, // match incoming skb->dev->ifindex); - } - #undef _OPT_NET_ARG - /* no match, nothing to be done */ - if (sk == NULL) - return -1; + if (sk == NULL) /* no match, nothing to be done */ + return -1; + } + ret = 1; /* retrying won't make things better */ + st = sk->sk_state; +#ifdef CONFIG_VSERVER + ugp->fw_groups[1] = sk->sk_xid; + ugp->fw_groups[2] = sk->sk_nid; +#else + ugp->fw_groups[1] = ugp->fw_groups[2] = 0; +#endif /* - * On a match, sk is returned with a refcount. - * In tcp some states reference a valid struct sock - * which is what we want, otherwise the struct sock - * referenced can be invalid, as in the case of the - * TCP_TIME_WAIT state, when it references a - * struct inet_timewait_sock which does not point to credentials. - * To be safe we exclude TCP_CLOSE and TCP_LAST_ACK states too. + * Exclude tcp states where sk points to a inet_timewait_sock which + * has no sk_socket field (surely TCP_TIME_WAIT, perhaps more). + * To be safe, use a whitelist and not a blacklist. + * Before dereferencing sk_socket grab a lock on sk_callback_lock. * * Once again we need conditional code because the UID and GID - * location changes between the two kernels. + * location changes between kernels. */ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28) /* use the current's real uid/gid */ @@ -555,24 +559,37 @@ linux_lookup(const int proto, const __be32 saddr, const __be16 sport, #define _CURR_UID f_cred->fsuid #define _CURR_GID f_cred->fsgid #endif - st = sk->sk_state; - if (st != TCP_TIME_WAIT && st != TCP_CLOSE && st != TCP_LAST_ACK && - sk->sk_socket && sk->sk_socket->file) { - ugp->fw_uid = sk->sk_socket->file->_CURR_UID; - uid = ugp->fw_uid; - ugp->fw_groups[0] = sk->sk_socket->file->_CURR_GID; + #ifdef CONFIG_VSERVER - ugp->fw_groups[1] = sk->sk_xid; - ugp->fw_groups[2] = sk->sk_nid; + ugp->fw_groups[1] = sk->sk_xid; + ugp->fw_groups[2] = sk->sk_nid; +#else + ugp->fw_groups[1] = + ugp->fw_groups[2] = 0; #endif - ret = 1; + ret = 1; + +#define GOOD_STATES ( \ + (1<sk_callback_lock); + if (sk->sk_socket && sk->sk_socket->file) { + ugp->fw_uid = sk->sk_socket->file->_CURR_UID; + ugp->fw_groups[0] = sk->sk_socket->file->_CURR_GID; + } + read_unlock_bh(&sk->sk_callback_lock); + } else { + ugp->fw_uid = ugp->fw_groups[0] = 0; } - if (1 && !skb->sk) /* the reference came from the lookup */ + if (!skb->sk) /* return the reference that came from the lookup */ sock_put(sk); +#undef GOOD_STATES #undef _CURR_UID #undef _CURR_GID - - //printf("%s dir %d sb>dst %p sb>dev %p ret %d id %d st%d\n", __FUNCTION__, dir, skb->dst, skb->dev, ret, uid, st); return ret; }