Fix handling of oversized requests

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index 67bac4b..51c8bd1 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -77,10 +77,9 @@ void setmysockopt(int sock) {
 #endif
 
 void err_nonfatal(const char *s) {
-       const int maxlen = 150;
-       char s1[maxlen], *s2;
+       char s1[150], *s2;
 
-       strncpy(s1, s, maxlen);
+       strncpy(s1, s, sizeof(s1));
        if ((s2 = strstr(s, "%m"))) {
                strcpy(s1 + (s2 - s), strerror(errno));
                s2 += 2;
@@ -95,7 +94,7 @@ void err_nonfatal(const char *s) {
        }
 #endif
 
-       s1[maxlen-1] = '\0';
+       s1[sizeof(s1)-1] = '\0';
 #ifdef ISSERVER
        syslog(LOG_ERR, "%s", s1);
        syslog(LOG_ERR, "Exiting.");
@@ -137,7 +136,7 @@ u64 ntohll(u64 a) {
 #define NBD_FLAG_HAS_FLAGS     (1 << 0)        /* Flags are there */
 #define NBD_FLAG_READ_ONLY     (1 << 1)        /* Device is read-only */
 
-#define NBD_DEFAULT_PORT       "12345" /* Port on which named exports are
+#define NBD_DEFAULT_PORT       "10809" /* Port on which named exports are
                                         * served */
 
 /* Options that the client can select to the server */