* [PATCH net-next] mptcp: fix syncookie build error on UP
@ 2020-08-01 14:39 Florian Westphal
2020-08-01 18:53 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2020-08-01 14:39 UTC (permalink / raw)
To: netdev
kernel test robot says:
net/mptcp/syncookies.c: In function 'mptcp_join_cookie_init':
include/linux/kernel.h:47:38: warning: division by zero [-Wdiv-by-zero]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
I forgot that spinock_t size is 0 on UP, so ARRAY_SIZE cannot be used.
Fixes: 9466a1ccebbe54 ("mptcp: enable JOIN requests even if cookies are in use")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/mptcp/syncookies.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/mptcp/syncookies.c b/net/mptcp/syncookies.c
index 6eb992789b50..abe0fd099746 100644
--- a/net/mptcp/syncookies.c
+++ b/net/mptcp/syncookies.c
@@ -125,8 +125,6 @@ void __init mptcp_join_cookie_init(void)
{
int i;
- for (i = 0; i < ARRAY_SIZE(join_entry_locks); i++)
+ for (i = 0; i < COOKIE_JOIN_SLOTS; i++)
spin_lock_init(&join_entry_locks[i]);
-
- BUILD_BUG_ON(ARRAY_SIZE(join_entry_locks) != ARRAY_SIZE(join_entries));
}
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] mptcp: fix syncookie build error on UP
2020-08-01 14:39 [PATCH net-next] mptcp: fix syncookie build error on UP Florian Westphal
@ 2020-08-01 18:53 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-08-01 18:53 UTC (permalink / raw)
To: fw; +Cc: netdev
From: Florian Westphal <fw@strlen.de>
Date: Sat, 1 Aug 2020 16:39:59 +0200
> kernel test robot says:
> net/mptcp/syncookies.c: In function 'mptcp_join_cookie_init':
> include/linux/kernel.h:47:38: warning: division by zero [-Wdiv-by-zero]
> #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
>
> I forgot that spinock_t size is 0 on UP, so ARRAY_SIZE cannot be used.
>
> Fixes: 9466a1ccebbe54 ("mptcp: enable JOIN requests even if cookies are in use")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Florian Westphal <fw@strlen.de>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-01 18:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-01 14:39 [PATCH net-next] mptcp: fix syncookie build error on UP Florian Westphal
2020-08-01 18:53 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).