netfilter: synproxy: fix unaligned access to TCP timestamp option
Subsystems (3)
PATCH 1/1 netfilter: synproxy: fix unaligned access to TCP timestamp option
synproxy_tstamp_adjust() reads and writes the TSval and TSecr fields of the TCP Timestamp option via direct __be32 pointer dereferences. These fields are at byte offsets 2 and 6 within the option, which are only 2-byte aligned — not 4-byte aligned for __be32 access.
Replace with get_unaligned_be32() / put_unaligned_be32() to safely handle the unaligned access on strict-alignment architectures.
--- net/netfilter/nf_synproxy_core.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
net/netfilter/nf_synproxy_core.c +15 -11
@@ -191,7 +191,7 @@ synproxy_tstamp_adjust(struct sk_buff *skb, unsigned int protoff, const struct nf_conn_synproxy *synproxy) {unsigned int optoff, optend; -__be32 *ptr, old; +__be32 old;if (synproxy->tsoff ==0 )return 1 ;
@@ -221,18 +221,22 @@ synproxy_tstamp_adjust(struct sk_buff *skb, unsigned int protoff,if (op[0 ] ==TCPOPT_TIMESTAMP && op[1 ] ==TCPOLEN_TIMESTAMP ) {if (CTINFO2DIR (ctinfo) ==IP_CT_DIR_REPLY ) { - ptr = (__be32 *)&op[2 ]; - old = *ptr; - *ptr =htonl (ntohl (*ptr) - - synproxy->tsoff); +u32 tsval =get_unaligned_be32 (&op[2 ]); +u32 new_tsval = tsval - synproxy->tsoff; + + old =cpu_to_be32 (tsval); +put_unaligned_be32 (new_tsval, &op[2 ]); +inet_proto_csum_replace4 (&th->check, skb, + old,cpu_to_be32 (new_tsval), false); }else { - ptr = (__be32 *)&op[6 ]; - old = *ptr; - *ptr =htonl (ntohl (*ptr) + - synproxy->tsoff); +u32 tsecr =get_unaligned_be32 (&op[6 ]); +u32 new_tsecr = tsecr + synproxy->tsoff; + + old =cpu_to_be32 (tsecr); +put_unaligned_be32 (new_tsecr, &op[6 ]); +inet_proto_csum_replace4 (&th->check, skb, + old,cpu_to_be32 (new_tsecr), false); } -inet_proto_csum_replace4 (&th->check, skb, - old, *ptr, false);return 1 ; } optoff += op[1 ];
Signature · 1 line
2.54.0
Quoted 10 lines · Rosen Penev
synproxy_tstamp_adjust()reads and writes the TSval and TSecr fields of the TCP Timestamp option via direct__be32pointer dereferences. These fields are at byte offsets 2 and 6 within the option, which are only 2-byte aligned — not 4-byte aligned for__be32access.Replace with
get_unaligned_be32()/put_unaligned_be32()to safely handle the unaligned access on strict-alignment architectures.Assisted-by opencode:big-pickleSigned-off-by Rosen Penev <[email protected]>
Hi,
as mentioned on [1] this was already fixed in [2]..
[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netfilter-devel/[email protected]/
Thanks,
Fernando.
Quoted 7 lines · Fernando Fernandez Mancera
Quoted 5 lines · Rosen Penev
synproxy_tstamp_adjust()reads and writes the TSval and TSecr fields of the TCP Timestamp option via direct__be32pointer dereferences. These fields are at byte offsets 2 and 6 within the option, which are only 2-byte aligned — not 4-byte aligned for__be32access.
Quoted 8 lines
Quoted 5 lines
Replace with
get_unaligned_be32()/put_unaligned_be32()to safely handle the unaligned access on strict-alignment architectures.Assisted-by opencode:big-pickleSigned-off-by Rosen Penev <[email protected]>Hi,
as mentioned on [1] this was already fixed in [2]..
OK.
Quoted 9 lines
[1]
https://lore.kernel.org/netdev/[email protected]/[2]
https://lore.kernel.org/netfilter-devel/[email protected]/Thanks,
Fernando.