Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

atm: idt77252: fix build broken on amd64

Browse Source 
idt77252 is broken and wont load on amd64 systems
  modprobe idt77252 shows the following

    idt77252_init: skb->cb is too small (48 < 56)

  Add packed attribute to struct idt77252_skb_prv and struct atm_skb_data
  so that the total size can be <= sizeof(skb->cb)
  Also convert runtime size check to buildtime size check in
  idt77252_init()

Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tong Zhang 2021-02-14 18:43:08 -05:00 committed by David S. Miller
parent 57baf8cc70
commit d0a0bbe7b0
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/atm/idt77252.c
View File

@ -3743,16 +3743,7 @@ static int __init idt77252_init(void)
struct sk_buff *skb; struct sk_buff *skb;
printk("%s: at %p\n", __func__, idt77252_init); printk("%s: at %p\n", __func__, idt77252_init);
BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct idt77252_skb_prv) + sizeof(struct atm_skb_data));
if (sizeof(skb->cb) < sizeof(struct atm_skb_data) +
sizeof(struct idt77252_skb_prv)) {
printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n",
__func__, (unsigned long) sizeof(skb->cb),
(unsigned long) sizeof(struct atm_skb_data) +
sizeof(struct idt77252_skb_prv));
return -EIO;
}
return pci_register_driver(&idt77252_driver); return pci_register_driver(&idt77252_driver);
} }

2
drivers/atm/idt77252.h
View File

@ -789,7 +789,7 @@ struct idt77252_skb_prv {
struct scqe tbd; /* Transmit Buffer Descriptor */ struct scqe tbd; /* Transmit Buffer Descriptor */
dma_addr_t paddr; /* DMA handle */ dma_addr_t paddr; /* DMA handle */
u32 pool; /* sb_pool handle */ u32 pool; /* sb_pool handle */
}; } __packed;
#define IDT77252_PRV_TBD(skb) \ #define IDT77252_PRV_TBD(skb) \
(((struct idt77252_skb_prv *)(ATM_SKB(skb)+1))->tbd) (((struct idt77252_skb_prv *)(ATM_SKB(skb)+1))->tbd)

2
include/linux/atmdev.h
View File

@ -207,7 +207,7 @@ struct atm_skb_data {
struct atm_vcc *vcc; /* ATM VCC */ struct atm_vcc *vcc; /* ATM VCC */
unsigned long atm_options; /* ATM layer options */ unsigned long atm_options; /* ATM layer options */
unsigned int acct_truesize; /* truesize accounted to vcc */ unsigned int acct_truesize; /* truesize accounted to vcc */
}; } __packed;
#define VCC_HTABLE_SIZE 32 #define VCC_HTABLE_SIZE 32