Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 406a1d868001423c85a3165288e566e65f424fe6

Authored by Herbert Xu
Committed by David S. Miller
1 parent 29ffe1a5c5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[AUDIT]: Increase skb->truesize in audit_expand 

The recent UDP patch exposed this bug in the audit code.  It
was calling pskb_expand_head without increasing skb->truesize.
The caller of pskb_expand_head needs to do so because that function
is designed to be called in places where truesize is already fixed
and therefore it doesn't update its value.

Because the audit system is using it in a place where the truesize
has not yet been fixed, it needs to update its value manually.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 7 additions and 3 deletions Side-by-side Diff

... ... @@ -1200,13 +1200,17 @@
1200 1200 static inline int audit_expand(struct audit_buffer *ab, int extra)
1201 1201 {
1202 1202 struct sk_buff *skb = ab->skb;
1203   - int ret = pskb_expand_head(skb, skb_headroom(skb), extra,
1204   - ab->gfp_mask);
  1203 + int oldtail = skb_tailroom(skb);
  1204 + int ret = pskb_expand_head(skb, 0, extra, ab->gfp_mask);
  1205 + int newtail = skb_tailroom(skb);
  1206 +
1205 1207 if (ret < 0) {
1206 1208 audit_log_lost("out of memory in audit_expand");
1207 1209 return 0;
1208 1210 }
1209   - return skb_tailroom(skb);
  1211 +
  1212 + skb->truesize += newtail - oldtail;
  1213 + return newtail;
1210 1214 }
1211 1215  
1212 1216 /*