20: Latest redbull and gs*01 CVE patch errors

[danielk43]

Hello, seeing these messages after the latest update. The gs patches don't apply to redbull but 2024-36929 is ok for gs.

Redbull only: CVE-2024-36929

../../../../../../kernel/google/redbull/net/core/skbuff.c:1363:47: error: use of undeclared identifier 'SKB_GSO_FRAGLIST'; did you mean 'SKB_GSO_PARTIAL'?
        if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
                                                     ^~~~~~~~~~~~~~~~
                                                     SKB_GSO_PARTIAL
../../../../../../kernel/google/redbull/include/asm-generic/bug.h:69:25: note: expanded from macro 'WARN_ON_ONCE'
        int __ret_warn_on = !!(condition);                      \
                               ^
../../../../../../kernel/google/redbull/include/linux/skbuff.h:566:2: note: 'SKB_GSO_PARTIAL' declared here
        SKB_GSO_PARTIAL = 1 << 12,
        ^
../../../../../../kernel/google/redbull/net/core/skbuff.c:1603:47: error: use of undeclared identifier 'SKB_GSO_FRAGLIST'; did you mean 'SKB_GSO_PARTIAL'?
        if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
                                                     ^~~~~~~~~~~~~~~~
                                                     SKB_GSO_PARTIAL
../../../../../../kernel/google/redbull/include/asm-generic/bug.h:69:25: note: expanded from macro 'WARN_ON_ONCE'
        int __ret_warn_on = !!(condition);                      \
                               ^
../../../../../../kernel/google/redbull/include/linux/skbuff.h:566:2: note: 'SKB_GSO_PARTIAL' declared here
        SKB_GSO_PARTIAL = 1 << 12,
        ^
2 errors generated.

GS101, GS201 only: CVE-2024-36915

../../../../../../kernel/google/gs201/private/gs-google/net/nfc/llcp_sock.c:250:9: error: implicit declaration of function 'copy_safe_from_sockptr' [-Werror,-Wimplic
it-function-declaration]
                err = copy_safe_from_sockptr(&opt, sizeof(opt),
                      ^
../../../../../../kernel/google/gs201/private/gs-google/net/nfc/llcp_sock.c:250:9: note: did you mean 'copy_from_sockptr'?
../../../../../../kernel/google/gs201/private/gs-google/include/linux/sockptr.h:53:19: note: 'copy_from_sockptr' declared here
static inline int copy_from_sockptr(void *dst, sockptr_t src, size_t size)
                  ^
1 error generated.

CVE-2024-36908

../../../../../../kernel/google/gs201/private/gs-google/block/blk-iocost.c:1380:58: error: no member named 'online' in 'struct blkg_policy_data'
        WARN_ON_ONCE(list_empty(&iocg->active_list) && iocg->pd.online);
                                                       ~~~~~~~~ ^
../../../../../../kernel/google/gs201/private/gs-google/include/asm-generic/bug.h:102:25: note: expanded from macro 'WARN_ON_ONCE'
        int __ret_warn_on = !!(condition);                      \
                               ^~~~~~~~~
1 error generated.

[SkewedZeppelin]

Should be fixed now.

Thank you!