diff options
| author | Salvatore Mesoraca <s.mesoraca16@gmail.com> | 2018-03-11 22:12:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-12 11:14:06 -0400 |
| commit | 678f4bda35483473ae7ad674ece4c7c43a000888 (patch) | |
| tree | f10b13a12ad1ea7f4790a6fa3ec6a064d22c7208 /net/llc | |
| parent | c16b1a9ccf70630004f3700532313ca0bcf3e663 (diff) | |
| download | linux-stable-678f4bda35483473ae7ad674ece4c7c43a000888.tar.gz linux-stable-678f4bda35483473ae7ad674ece4c7c43a000888.tar.bz2 linux-stable-678f4bda35483473ae7ad674ece4c7c43a000888.zip | |
net: llc: drop VLA in llc_sap_mcast()
Avoid a VLA[1] by using a real constant expression instead of a variable.
The compiler should be able to optimize the original code and avoid using
an actual VLA. Anyway this change is useful because it will avoid a false
positive with -Wvla, it might also help the compiler generating better
code.
[1] https://lkml.org/lkml/2018/3/7/621
Signed-off-by: Salvatore Mesoraca <s.mesoraca16@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/llc_sap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c index d90928f50226..a7f7b8ff4729 100644 --- a/net/llc/llc_sap.c +++ b/net/llc/llc_sap.c @@ -394,8 +394,9 @@ static void llc_sap_mcast(struct llc_sap *sap, const struct llc_addr *laddr, struct sk_buff *skb) { - int i = 0, count = 256 / sizeof(struct sock *); - struct sock *sk, *stack[count]; + int i = 0; + struct sock *sk; + struct sock *stack[256 / sizeof(struct sock *)]; struct llc_sock *llc; struct hlist_head *dev_hb = llc_sk_dev_hash(sap, skb->dev->ifindex); @@ -408,7 +409,7 @@ static void llc_sap_mcast(struct llc_sap *sap, continue; sock_hold(sk); - if (i < count) + if (i < ARRAY_SIZE(stack)) stack[i++] = sk; else { llc_do_mcast(sap, skb, stack, i); |