diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-08-18 21:32:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-18 21:32:32 -0700 |
| commit | 9f593653742d1dd816c4e94c6e5154a57ccba6d1 (patch) | |
| tree | 1e71181cc80da8dc3d6e1da202943482b9eb5500 /net/ipv4 | |
| parent | fab00c5d15091546be681426c60b2ed2c10513bf (diff) | |
| download | op-kernel-dev-9f593653742d1dd816c4e94c6e5154a57ccba6d1.zip op-kernel-dev-9f593653742d1dd816c4e94c6e5154a57ccba6d1.tar.gz | |
nf_nat: use secure_ipv4_port_ephemeral() for NAT port randomization
Use incoming network tuple as seed for NAT port randomization.
This avoids concerns of leaking net_random() bits, and also gives better
port distribution. Don't have NAT server, compile tested only.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
[ added missing EXPORT_SYMBOL_GPL ]
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_common.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_proto_common.c b/net/ipv4/netfilter/nf_nat_proto_common.c index 91537f1..6c4f11f 100644 --- a/net/ipv4/netfilter/nf_nat_proto_common.c +++ b/net/ipv4/netfilter/nf_nat_proto_common.c @@ -73,9 +73,13 @@ bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple, range_size = ntohs(range->max.all) - min + 1; } - off = *rover; if (range->flags & IP_NAT_RANGE_PROTO_RANDOM) - off = net_random(); + off = secure_ipv4_port_ephemeral(tuple->src.u3.ip, tuple->dst.u3.ip, + maniptype == IP_NAT_MANIP_SRC + ? tuple->dst.u.all + : tuple->src.u.all); + else + off = *rover; for (i = 0; i < range_size; i++, off++) { *portptr = htons(min + off % range_size); |
