shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: preserve CRC values in struct sk_buff due to ip_defrag_offset removal

Browse Source 
In commit 7d0567842b ("inet: inet_defrag: prevent sk release while
still in use"), the ip_defrag_offset variable was removed from the union
in struct sk_buff and moved to an internal-to-the-network-stack location
in order to resolve an issue.

This does not change the structure size, but the ABI tracking logic
doesn't appreciate the variable going away, so add the union back.

No functional changes here as no external code could ever use the
ip_defrag_offset variable as seen in the commit that changed this.

Bug: 161946584
Fixes: 7d0567842b ("inet: inet_defrag: prevent sk release while still in use")
Change-Id: Id09f9398f41d9dbe9742807495d260e1f7a7a516
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-05-24 14:12:38 +00:00
parent 416b90bf47
commit da08c217d8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/skbuff.h
View File

@@ -872,7 +872,15 @@ struct sk_buff {
struct llist_node ll_node; struct llist_node ll_node;
}; };
struct sock *sk; /* ANDROID:
* Put back the union removed in commit 7d0567842b78 ("inet:
* inet_defrag: prevent sk release while still in use") to preserve the
* crcs of stuff. Does not affect any code functionality.
*/
union {
struct sock *sk;
int ip_defrag_offset;
};
union { union {
ktime_t tstamp; ktime_t tstamp;