projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dbb5918
)
netfilter: nft_limit: fix divided by zero panic
author
Liping Zhang
<
[email protected]
>
Tue, 27 Sep 2016 12:49:19 +0000
(20:49 +0800)
committer
Pablo Neira Ayuso
<
[email protected]
>
Tue, 4 Oct 2016 06:59:03 +0000
(08:59 +0200)
After I input the following nftables rule, a panic happened on my system:
# nft add rule filter OUTPUT limit rate 0xf00000000 bytes/second
divide error: 0000 [#1] SMP
[ ... ]
RIP: 0010:[<
ffffffffa059035e
>] [<
ffffffffa059035e
>]
nft_limit_pkt_bytes_eval+0x2e/0xa0 [nft_limit]
Call Trace:
[<
ffffffffa05721bb
>] nft_do_chain+0xfb/0x4e0 [nf_tables]
[<
ffffffffa044f236
>] ? nf_nat_setup_info+0x96/0x480 [nf_nat]
[<
ffffffff81753767
>] ? ipt_do_table+0x327/0x610
[<
ffffffffa044f677
>] ? __nf_nat_alloc_null_binding+0x57/0x80 [nf_nat]
[<
ffffffffa058b21f
>] nft_ipv4_output+0xaf/0xd0 [nf_tables_ipv4]
[<
ffffffff816f4aa2
>] nf_iterate+0x62/0x80
[<
ffffffff816f4b33
>] nf_hook_slow+0x73/0xd0
[<
ffffffff81703d0d
>] __ip_local_out+0xcd/0xe0
[<
ffffffff81701d90
>] ? ip_forward_options+0x1b0/0x1b0
[<
ffffffff81703d3c
>] ip_local_out+0x1c/0x40
This is because divisor is 64-bit, but we treat it as a 32-bit integer,
then 0xf00000000 becomes zero, i.e. divisor becomes 0.
Signed-off-by: Liping Zhang <
[email protected]
>
Signed-off-by: Pablo Neira Ayuso <
[email protected]
>
net/netfilter/nft_limit.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nft_limit.c
b/net/netfilter/nft_limit.c
index 070b98938e02a6a5239318151cff3bff94fb32fb..c6baf412236d662b0d165fec3b4ff26579c9c6d8 100644
(file)
--- a/
net/netfilter/nft_limit.c
+++ b/
net/netfilter/nft_limit.c
@@
-145,7
+145,7
@@
static int nft_limit_pkts_init(const struct nft_ctx *ctx,
if (err < 0)
return err;
- priv->cost = div_u64(priv->limit.nsecs, priv->limit.rate);
+ priv->cost = div
64
_u64(priv->limit.nsecs, priv->limit.rate);
return 0;
}
@@
-170,7
+170,7
@@
static void nft_limit_pkt_bytes_eval(const struct nft_expr *expr,
const struct nft_pktinfo *pkt)
{
struct nft_limit *priv = nft_expr_priv(expr);
- u64 cost = div_u64(priv->nsecs * pkt->skb->len, priv->rate);
+ u64 cost = div
64
_u64(priv->nsecs * pkt->skb->len, priv->rate);
if (nft_limit_eval(priv, cost))
regs->verdict.code = NFT_BREAK;