Blame openssh-6.6p1-allow-ip-opts.patch
|
 |
94c6f8d |
diff --git a/canohost.c b/canohost.c
|
|
|
94c6f8d |
index a61a8c9..97ce58c 100644
|
|
|
94c6f8d |
--- a/canohost.c
|
|
|
94c6f8d |
+++ b/canohost.c
|
|
|
94c6f8d |
@@ -165,12 +165,29 @@ check_ip_options(int sock, char *ipaddr)
|
|
 |
49d0cf7 |
option_size = sizeof(options);
|
|
|
49d0cf7 |
if (getsockopt(sock, ipproto, IP_OPTIONS, options,
|
|
|
49d0cf7 |
&option_size) >= 0 && option_size != 0) {
|
|
|
49d0cf7 |
- text[0] = '\0';
|
|
|
49d0cf7 |
- for (i = 0; i < option_size; i++)
|
|
|
49d0cf7 |
- snprintf(text + i*3, sizeof(text) - i*3,
|
|
|
49d0cf7 |
- " %2.2x", options[i]);
|
|
|
49d0cf7 |
- fatal("Connection from %.100s with IP options:%.800s",
|
|
|
49d0cf7 |
- ipaddr, text);
|
|
|
49d0cf7 |
+ i = 0;
|
|
|
49d0cf7 |
+ do {
|
|
|
49d0cf7 |
+ switch (options[i]) {
|
|
|
49d0cf7 |
+ case 0:
|
|
|
49d0cf7 |
+ case 1:
|
|
|
49d0cf7 |
+ ++i;
|
|
|
49d0cf7 |
+ break;
|
|
|
94c6f8d |
+ case 130:
|
|
|
94c6f8d |
+ case 133:
|
|
|
94c6f8d |
+ case 134:
|
|
|
94c6f8d |
+ i += options[i + 1];
|
|
|
94c6f8d |
+ break;
|
|
|
94c6f8d |
+ default:
|
|
|
49d0cf7 |
+ /* Fail, fatally, if we detect either loose or strict
|
|
|
49d0cf7 |
+ * source routing options. */
|
|
|
49d0cf7 |
+ text[0] = '\0';
|
|
|
49d0cf7 |
+ for (i = 0; i < option_size; i++)
|
|
|
49d0cf7 |
+ snprintf(text + i*3, sizeof(text) - i*3,
|
|
|
49d0cf7 |
+ " %2.2x", options[i]);
|
|
|
49d0cf7 |
+ fatal("Connection from %.100s with IP options:%.800s",
|
|
|
49d0cf7 |
+ ipaddr, text);
|
|
|
49d0cf7 |
+ }
|
|
|
49d0cf7 |
+ } while (i < option_size);
|
|
|
49d0cf7 |
}
|
|
|
49d0cf7 |
#endif /* IP_OPTIONS */
|
|
|
49d0cf7 |
}
|