logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0003-Avoid-use-of-statement-expressions.patch (4249B)

    

  1. From 30dafd9bd223318058b5c2e5577bf4cf5b853f6d Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Wed, 1 Apr 2026 22:05:31 -0700
  4. Subject: [PATCH] Avoid use of statement expressions
  6. ---
  7.  src/ipc-uapi.h | 65 +++++++++++++++++++++++++++++++-------------------
  8.  1 file changed, 41 insertions(+), 24 deletions(-)
  10. diff --git a/src/ipc-uapi.h b/src/ipc-uapi.h
  11. index 1d8a271..e9f4059 100644
  12. --- a/src/ipc-uapi.h
  13. +++ b/src/ipc-uapi.h
  14. @@ -124,16 +124,16 @@ out:
  15.  	return ret;
  16.  }
  17.  
  18. -#define NUM(max) ({ \
  19. -	unsigned long long num; \
  20. -	char *end; \
  21. -	if (!char_is_digit(value[0])) \
  22. -		break; \
  23. -	num = strtoull(value, &end, 10); \
  24. -	if (*end || num > max) \
  25. -		break; \
  26. -	num; \
  27. -})
  28. +static bool num_from_str(const char *value, unsigned long long max, unsigned long long *num)
  29. +{
  30. +	char *end;
  31. +	if (!char_is_digit(value[0]))
  32. +		return false;
  33. +	*num = strtoull(value, &end, 10);
  34. +	if (*end || *num > max)
  35. +		return false;
  36. +	return true;
  37. +}
  38.  
  39.  static int userspace_get_device(struct wgdevice **out, const char *iface)
  40.  {
  41. @@ -144,6 +144,7 @@ static int userspace_get_device(struct wgdevice **out, const char *iface)
  42.  	char *key = NULL, *value;
  43.  	FILE *f;
  44.  	int ret = -EPROTO;
  45. +	unsigned long long num;
  46.  
  47.  	*out = dev = calloc(1, sizeof(*dev));
  48.  	if (!dev)
  49. @@ -178,10 +179,14 @@ static int userspace_get_device(struct wgdevice **out, const char *iface)
  50.  			curve25519_generate_public(dev->public_key, dev->private_key);
  51.  			dev->flags |= WGDEVICE_HAS_PRIVATE_KEY | WGDEVICE_HAS_PUBLIC_KEY;
  52.  		} else if (!peer && !strcmp(key, "listen_port")) {
  53. -			dev->listen_port = NUM(0xffffU);
  54. +			if (!num_from_str(value, 0xffffU, &num))
  55. +				break;
  56. +			dev->listen_port = num;
  57.  			dev->flags |= WGDEVICE_HAS_LISTEN_PORT;
  58.  		} else if (!peer && !strcmp(key, "fwmark")) {
  59. -			dev->fwmark = NUM(0xffffffffU);
  60. +			if (!num_from_str(value, 0xffffffffU, &num))
  61. +				break;
  62. +			dev->fwmark = num;
  63.  			dev->flags |= WGDEVICE_HAS_FWMARK;
  64.  		} else if (!strcmp(key, "public_key")) {
  65.  			struct wgpeer *new_peer = calloc(1, sizeof(*new_peer));
  66. @@ -242,7 +247,9 @@ static int userspace_get_device(struct wgdevice **out, const char *iface)
  67.  			}
  68.  			freeaddrinfo(resolved);
  69.  		} else if (peer && !strcmp(key, "persistent_keepalive_interval")) {
  70. -			peer->persistent_keepalive_interval = NUM(0xffffU);
  71. +			if (!num_from_str(value, 0xffffU, &num))
  72. +				break;
  73. +			peer->persistent_keepalive_interval = num;
  74.  			peer->flags |= WGPEER_HAS_PERSISTENT_KEEPALIVE_INTERVAL;
  75.  		} else if (peer && !strcmp(key, "allowed_ip")) {
  76.  			struct wgallowedip *new_allowedip;
  77. @@ -271,16 +278,27 @@ static int userspace_get_device(struct wgdevice **out, const char *iface)
  78.  			allowedip->cidr = strtoul(mask, &end, 10);
  79.  			if (*end || allowedip->family == AF_UNSPEC || (allowedip->family == AF_INET6 && allowedip->cidr > 128) || (allowedip->family == AF_INET && allowedip->cidr > 32))
  80.  				break;
  81. -		} else if (peer && !strcmp(key, "last_handshake_time_sec"))
  82. -			peer->last_handshake_time.tv_sec = NUM(0x7fffffffffffffffULL);
  83. -		else if (peer && !strcmp(key, "last_handshake_time_nsec"))
  84. -			peer->last_handshake_time.tv_nsec = NUM(0x7fffffffffffffffULL);
  85. -		else if (peer && !strcmp(key, "rx_bytes"))
  86. -			peer->rx_bytes = NUM(0xffffffffffffffffULL);
  87. -		else if (peer && !strcmp(key, "tx_bytes"))
  88. -			peer->tx_bytes = NUM(0xffffffffffffffffULL);
  89. -		else if (!strcmp(key, "errno"))
  90. -			ret = -NUM(0x7fffffffU);
  91. +		} else if (peer && !strcmp(key, "last_handshake_time_sec")) {
  92. +			if (!num_from_str(value, 0x7fffffffffffffffULL, &num))
  93. +				break;
  94. +			peer->last_handshake_time.tv_sec = num;
  95. +		} else if (peer && !strcmp(key, "last_handshake_time_nsec")) {
  96. +			if (!num_from_str(value, 0x7fffffffffffffffULL, &num))
  97. +				break;
  98. +			peer->last_handshake_time.tv_nsec = num;
  99. +		} else if (peer && !strcmp(key, "rx_bytes")) {
  100. +			if (!num_from_str(value, 0xffffffffffffffffULL, &num))
  101. +				break;
  102. +			peer->rx_bytes = num;
  103. +		} else if (peer && !strcmp(key, "tx_bytes")) {
  104. +			if (!num_from_str(value, 0xffffffffffffffffULL, &num))
  105. +				break;
  106. +			peer->tx_bytes = num;
  107. +		} else if (!strcmp(key, "errno")) {
  108. +			if (!num_from_str(value, 0x7fffffffU, &num))
  109. +				break;
  110. +			ret = -num;
  111. +		}
  112.  	}
  113.  	ret = -EPROTO;
  114.  err:
  115. @@ -294,4 +312,3 @@ err:
  116.  	return ret;
  117.  
  118.  }
  119. -#undef NUM
  120. -- 
  121. 2.49.0