summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-04-29 10:28:16 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-04-29 10:28:16 -0300
commit14ccbeb4e40042e3fe624707d5b2e6c047149a2f (patch)
tree1f358d02b093ce9fceb5491c03a5972a53a8e8da /include
parent933e5ca5f0628c081484c5bc976c37db0cfbc94a (diff)
downloadmariadb-git-14ccbeb4e40042e3fe624707d5b2e6c047149a2f.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.
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 94b34c1c3f0..2eeec270cd0 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -219,6 +219,16 @@ typedef struct st_net {
my_bool report_error; /* We should report error (we have unreported error) */
my_bool return_errno;
+#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
+ /*
+ Controls whether a big packet should be skipped.
+
+ Initially set to FALSE by default. Unauthenticated sessions must have
+ this set to FALSE so that the server can't be tricked to read packets
+ indefinitely.
+ */
+ my_bool skip_big_packet;
+#endif
} NET;
#define packet_error (~(unsigned long) 0)