diff mbox series

[5.4,41/43] net: add __must_check to skb_put_padto()

Message ID	20200925124729.753332467@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=ikAt=DC=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Eric Dumazet <edumazet@google.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 5.4 41/43] net: add __must_check to skb_put_padto() Date: Fri, 25 Sep 2020 14:48:53 +0200 Message-Id: <20200925124729.753332467@linuxfoundation.org> In-Reply-To: <20200925124723.575329814@linuxfoundation.org> References: <20200925124723.575329814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/43] ibmvnic fix NULL tx_pools and rx_tools issue at do_reset [5.4,03/43] ibmvnic: add missing parenthesis in do_reset() [5.4,04/43] kprobes: fix kill kprobe which has been marked as gone [5.4,05/43] mm/thp: fix __split_huge_pmd_locked() for migration PMD [5.4,06/43] act_ife: load meta modules before tcf_idr_check_alloc() [5.4,07/43] bnxt_en: Avoid sending firmware messages when AER error is detected. [5.4,08/43] bnxt_en: Fix NULL ptr dereference crash in bnxt_fw_reset_task() [5.4,09/43] cxgb4: fix memory leak during module unload [5.4,10/43] cxgb4: Fix offset when clearing filter byte counters [5.4,11/43] geneve: add transport ports in route lookup for geneve [5.4,12/43] hdlc_ppp: add range checks in ppp_cp_parse_cr() [5.4,13/43] ip: fix tos reflection in ack and reset packets [5.4,14/43] ipv4: Initialize flowi4_multipath_hash in data path [5.4,15/43] ipv4: Update exception handling for multipath routes via same device [5.4,16/43] ipv6: avoid lockdep issue in fib6_del() [5.4,17/43] net: bridge: br_vlan_get_pvid_rcu() should dereference the VLAN group under RCU [5.4,18/43] net: DCB: Validate DCB_ATTR_DCB_BUFFER argument [5.4,19/43] net: dsa: rtl8366: Properly clear member config [5.4,20/43] net: Fix bridge enslavement failure [5.4,21/43] net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC [5.4,22/43] net/mlx5: Fix FTE cleanup [5.4,23/43] net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc [5.4,24/43] net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant [5.4,25/43] nfp: use correct define to return NONE fec [5.4,26/43] taprio: Fix allowing too small intervals [5.4,27/43] tipc: Fix memory leak in tipc_group_create_member() [5.4,28/43] tipc: fix shutdown() of connection oriented socket [5.4,29/43] tipc: use skb_unshare() instead in tipc_buf_append() [5.4,30/43] net/mlx5e: Enable adding peer miss rules only if merged eswitch is supported [5.4,31/43] net/mlx5e: TLS, Do not expose FPGA TLS counter if not supported [5.4,32/43] bnxt_en: return proper error codes in bnxt_show_temp [5.4,33/43] bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex. [5.4,34/43] net: lantiq: Wake TX queue again [5.4,35/43] net: lantiq: use netif_tx_napi_add() for TX NAPI [5.4,36/43] net: lantiq: Use napi_complete_done() [5.4,37/43] net: lantiq: Disable IRQs only if NAPI gets scheduled [5.4,38/43] net: phy: Avoid NPD upon phy_detach() when driver is unbound [5.4,39/43] net: phy: Do not warn in phy_stop() on PHY_DOWN [5.4,40/43] net: qrtr: check skb_put_padto() return value [5.4,41/43] net: add __must_check to skb_put_padto() [5.4,42/43] mm: memcg: fix memcg reclaim soft lockup [5.4,43/43] iommu/amd: Use cmpxchg_double() when updating 128-bit IRTE

Commit Message

gregkh@linuxfoundation.org Sept. 25, 2020, 12:48 p.m. UTC

From: Eric Dumazet <edumazet@google.com>

[ Upstream commit 4a009cb04aeca0de60b73f37b102573354214b52 ]

skb_put_padto() and __skb_put_padto() callers
must check return values or risk use-after-free.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 include/linux/skbuff.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff mbox series

Patch

--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3185,8 +3185,9 @@  static inline int skb_padto(struct sk_bu
  *	is untouched. Otherwise it is extended. Returns zero on
  *	success. The skb is freed on error if @free_on_error is true.
  */
-static inline int __skb_put_padto(struct sk_buff *skb, unsigned int len,
-				  bool free_on_error)
+static inline int __must_check __skb_put_padto(struct sk_buff *skb,
+					       unsigned int len,
+					       bool free_on_error)
 {
 	unsigned int size = skb->len;
 
@@ -3209,7 +3210,7 @@  static inline int __skb_put_padto(struct
  *	is untouched. Otherwise it is extended. Returns zero on
  *	success. The skb is freed on error.
  */
-static inline int skb_put_padto(struct sk_buff *skb, unsigned int len)
+static inline int __must_check skb_put_padto(struct sk_buff *skb, unsigned int len)
 {
 	return __skb_put_padto(skb, len, true);
 }