Erik Stromdahl <erik.stromdahl@xxxxxxxxx> writes: > This patch fixes a bug with padding of the skb data buffer. > Since skb_trim can only be used to reduce the skb len, it is useless when > we pad (increase the length of) the skb. Instead we must set skb->len > directly. > > Signed-off-by: Erik Stromdahl <erik.stromdahl@xxxxxxxxx> > --- > drivers/net/wireless/ath/ath10k/sdio.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c > index 3eb241cb8a25..989e3f563f3d 100644 > --- a/drivers/net/wireless/ath/ath10k/sdio.c > +++ b/drivers/net/wireless/ath/ath10k/sdio.c > @@ -1496,7 +1496,12 @@ static int ath10k_sdio_hif_tx_sg(struct ath10k *ar, u8 pipe_id, > skb = items[i].transfer_context; > padded_len = ath10k_sdio_calc_txrx_padded_len(ar_sdio, > skb->len); > - skb_trim(skb, padded_len); > + /* FIXME: unsure if just extending the skb len is the right > + * thing to do since we might read outside the skb->data > + * buffer. But we really don't want to realloc the skb just to > + * pad the length. > + */ > + skb->len = padded_len; Good catch! But I don't think you can modify skb->len directly like that. There is skb_pad() but that doesn't change skb->len, so that most likely needs more changes. So maybe skb_put() is the safest here? -- Kalle Valo
