| Message ID | 20180813221256.299221-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 1bbf3aed25e0fc256e825da1f5c45d7b4daa828e |
| Headers | show |
| Series | bnxt_en: take coredump_record structure off stack | expand |
From: Arnd Bergmann <arnd@arndb.de> Date: Tue, 14 Aug 2018 00:12:45 +0200 > The bnxt_coredump_record structure is very long, causing a warning > about possible stack overflow on 32-bit architectures: > > drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c: In function 'bnxt_get_coredump': > drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:2989:1: error: the frame size of 1188 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] > > I could not see any reason to operate on an on-stack copy of the > structure before copying it back into the caller-provided buffer, which > also simplifies the code here. > > Fixes: 6c5657d085ae ("bnxt_en: Add support for ethtool get dump.") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied.
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 539be1d1b67f..e52d7af3ab3e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -2900,7 +2900,6 @@ static int bnxt_get_coredump(struct bnxt *bp, void *buf, u32 *dump_len) struct coredump_segment_record *seg_record = NULL; u32 offset = 0, seg_hdr_len, seg_record_len; struct bnxt_coredump_segment_hdr seg_hdr; - struct bnxt_coredump_record coredump_rec; struct bnxt_coredump coredump = {NULL}; time64_t start_time; u16 start_utc; @@ -2976,14 +2975,12 @@ static int bnxt_get_coredump(struct bnxt *bp, void *buf, u32 *dump_len) } err: - if (buf) { - bnxt_fill_coredump_record(bp, &coredump_rec, start_time, + if (buf) + bnxt_fill_coredump_record(bp, buf + offset, start_time, start_utc, coredump.total_segs + 1, rc); - memcpy(buf + offset, &coredump_rec, sizeof(coredump_rec)); - } kfree(coredump.data); - *dump_len += sizeof(coredump_rec); + *dump_len += sizeof(struct bnxt_coredump_record); return rc; }
The bnxt_coredump_record structure is very long, causing a warning about possible stack overflow on 32-bit architectures: drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c: In function 'bnxt_get_coredump': drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:2989:1: error: the frame size of 1188 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] I could not see any reason to operate on an on-stack copy of the structure before copying it back into the caller-provided buffer, which also simplifies the code here. Fixes: 6c5657d085ae ("bnxt_en: Add support for ethtool get dump.") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.18.0