bpf: Use swap() instead of open coding it
authorJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Tue, 22 Mar 2022 06:21:49 +0000 (14:21 +0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 1 Apr 2022 20:27:07 +0000 (22:27 +0200)
Clean the following coccicheck warning:

./kernel/trace/bpf_trace.c:2263:34-35: WARNING opportunity for swap().
./kernel/trace/bpf_trace.c:2264:40-41: WARNING opportunity for swap().

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220322062149.109180-1-jiapeng.chong@linux.alibaba.com
kernel/trace/bpf_trace.c

index 7fa2ebc07f603e44523a36d73ca888e4eb0c9975..836f021cb609246eca44a20156d677906db0476f 100644 (file)
@@ -2254,15 +2254,13 @@ static void bpf_kprobe_multi_cookie_swap(void *a, void *b, int size, const void
        const struct bpf_kprobe_multi_link *link = priv;
        unsigned long *addr_a = a, *addr_b = b;
        u64 *cookie_a, *cookie_b;
-       unsigned long tmp1;
-       u64 tmp2;
 
        cookie_a = link->cookies + (addr_a - link->addrs);
        cookie_b = link->cookies + (addr_b - link->addrs);
 
        /* swap addr_a/addr_b and cookie_a/cookie_b values */
-       tmp1 = *addr_a; *addr_a = *addr_b; *addr_b = tmp1;
-       tmp2 = *cookie_a; *cookie_a = *cookie_b; *cookie_b = tmp2;
+       swap(*addr_a, *addr_b);
+       swap(*cookie_a, *cookie_b);
 }
 
 static int __bpf_kprobe_multi_cookie_cmp(const void *a, const void *b)