diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-04-29 10:28:16 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-04-29 10:28:16 -0300 |
| commit | 54705ab1762eb305f389d3cf1a16edc88b3361bc (patch) | |
| tree | 1f358d02b093ce9fceb5491c03a5972a53a8e8da /sql/net_serv.cc | |
| parent | 0d5dbb166b1bcd39588268d4148f02c9f58575f8 (diff) | |
| download | mariadb-git-54705ab1762eb305f389d3cf1a16edc88b3361bc.tar.gz | |
Bug#50974: Server keeps receiving big (> max_allowed_packet) packets indefinitely.
The server could be tricked to read packets indefinitely if it
received a packet larger than the maximum size of one packet.
This problem is aggravated by the fact that it can be triggered
before authentication.
The solution is to no skip big packets for non-authenticated
sessions. If a big packet is sent before a session is authen-
ticated, a error is returned and the connection is closed.
include/mysql_com.h:
Add skip flag. Only used in server builds.
sql/net_serv.cc:
Control whether big packets can be skipped.
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index fdabad6f569..1d1871e27a8 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -141,6 +141,9 @@ my_bool my_net_init(NET *net, Vio* vio) net->query_cache_query= 0; #endif net->report_error= 0; +#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY) + net->skip_big_packet= FALSE; +#endif if (vio != 0) /* If real connection */ { @@ -947,6 +950,7 @@ my_real_read(NET *net, ulong *complen) { #if defined(MYSQL_SERVER) && !defined(NO_ALARM) if (!net->compress && + net->skip_big_packet && !my_net_skip_rest(net, (uint32) len, &alarmed, &alarm_buff)) net->error= 3; /* Successfully skiped packet */ #endif |