Skip to content

Commit

Permalink
net: gro: fix napi_gro_cb zeroed alignment
Browse files Browse the repository at this point in the history
Add 2 byte padding to napi_gro_cb struct to ensure zeroed member is
aligned after flush_id member was removed in the original commit.

Fixes: 4b0ebbc ("net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment")
Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Richard Gobert <richardbgobert@gmail.com>
Link: https://lore.kernel.org/r/fca08735-c245-49e5-af72-82900634f144@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Richard Gobert authored and Jakub Kicinski committed May 14, 2024
1 parent 79982e8 commit 386f0cf
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions include/net/gro.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ struct napi_gro_cb {
/* Used in ipv6_gro_receive() and foo-over-udp and esp-in-udp */
u16 proto;

/* used to support CHECKSUM_COMPLETE for tunneling protocols */
__wsum csum;
u16 pad;

/* Used in napi_gro_cb::free */
#define NAPI_GRO_FREE 1
Expand Down Expand Up @@ -85,6 +84,9 @@ struct napi_gro_cb {
u8 is_flist:1;
);

/* used to support CHECKSUM_COMPLETE for tunneling protocols */
__wsum csum;

/* L3 offsets */
union {
struct {
Expand Down

0 comments on commit 386f0cf

Please sign in to comment.