diff options
| author |   Patrick McHardy <kaber@trash.net> | 2006-05-19 02:17:18 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2006-05-19 02:17:18 -0700 |
| commit | ee433530d96a7b0af24ab616e5b51f1d89f9ae38 (patch) | |
| tree | ef97ce3211d8a034a24de86a06741e662be2c27e /net | |
| parent | [NETFILTER]: Fix do_add_counters race, possible oops or info leak (CVE-2006-0039) (diff) | |
| download | linux-dev-ee433530d96a7b0af24ab616e5b51f1d89f9ae38.tar.xz linux-dev-ee433530d96a7b0af24ab616e5b51f1d89f9ae38.zip | |
[NETFILTER]: nfnetlink_log: fix byteorder confusion
flags is a u16, so use htons instead of htonl. Also avoid double
conversion.
Noticed by Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index c60273cad778..61cdda4e5d3b 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -321,7 +321,7 @@ static int nfulnl_set_flags(struct nfulnl_instance *inst, u_int16_t flags) { spin_lock_bh(&inst->lock); - inst->flags = ntohs(flags); + inst->flags = flags; spin_unlock_bh(&inst->lock); return 0; @@ -902,7 +902,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, if (nfula[NFULA_CFG_FLAGS-1]) { u_int16_t flags = *(u_int16_t *)NFA_DATA(nfula[NFULA_CFG_FLAGS-1]); - nfulnl_set_flags(inst, ntohl(flags)); + nfulnl_set_flags(inst, ntohs(flags)); } out_put: |