Skip to content

Commit 7f23aa7

Browse files
edumazetgregkh
authored andcommitted
net: add __must_check to skb_put_padto()
[ Upstream commit 4a009cb ] skb_put_padto() and __skb_put_padto() callers must check return values or risk use-after-free. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0d5a7af commit 7f23aa7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

include/linux/skbuff.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3185,8 +3185,9 @@ static inline int skb_padto(struct sk_buff *skb, unsigned int len)
31853185
* is untouched. Otherwise it is extended. Returns zero on
31863186
* success. The skb is freed on error if @free_on_error is true.
31873187
*/
3188-
static inline int __skb_put_padto(struct sk_buff *skb, unsigned int len,
3189-
bool free_on_error)
3188+
static inline int __must_check __skb_put_padto(struct sk_buff *skb,
3189+
unsigned int len,
3190+
bool free_on_error)
31903191
{
31913192
unsigned int size = skb->len;
31923193

@@ -3209,7 +3210,7 @@ static inline int __skb_put_padto(struct sk_buff *skb, unsigned int len,
32093210
* is untouched. Otherwise it is extended. Returns zero on
32103211
* success. The skb is freed on error.
32113212
*/
3212-
static inline int skb_put_padto(struct sk_buff *skb, unsigned int len)
3213+
static inline int __must_check skb_put_padto(struct sk_buff *skb, unsigned int len)
32133214
{
32143215
return __skb_put_padto(skb, len, true);
32153216
}

0 commit comments

Comments
 (0)