diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
index 65e19fe60a49423ca767084ab7a272230de57d72..0970af2cb70fb66b2b6e9cb1dfa9e78e350d5464 100644
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
@@ -293,7 +293,7 @@ static inline int bpf_cgroup_storage_assign(struct bpf_prog *prog,
 static inline void bpf_cgroup_storage_release(struct bpf_prog *prog,
 					      struct bpf_map *map) {}
 static inline struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(
-	struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return 0; }
+	struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return NULL; }
 static inline void bpf_cgroup_storage_free(
 	struct bpf_cgroup_storage *storage) {}
 
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 0c423b8cd75cce9ada273d545216112c829964e0..cb161146d52b03d1f380a25315f67b59f327a71f 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -28,7 +28,7 @@ static __always_inline u32 bpf_test_run_one(struct bpf_prog *prog, void *ctx,
 
 static u32 bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, u32 *time)
 {
-	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { 0 };
+	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { NULL };
 	enum bpf_cgroup_storage_type stype;
 	u64 time_start, time_spent = 0;
 	u32 ret = 0, i;