From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71DF614600D; Thu, 13 Jun 2024 11:59:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718279944; cv=none; b=NQJZXkqGTrWt2ufQ7JxKviwD8f5aJOC+fnINNBvIq48RP/KoJwFvDHNg9pJzPMw2RdppwgC21W8hgS7RDFYJWInFeHEl4q14oKqltVxzzxRGe+medBuVuKjsJWi6J/Q+4hif91/ODniog6ElSt0EohRbnudsnAQB4fYkVEXA2Is= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718279944; c=relaxed/simple; bh=saqYJz0hyELiCrjLdIUmq1hpMqjaStEPkGHOgDafA7s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CE7nct7gk7i8DPf8QOgwn+bau9Cj6K0omcQv3IztqNx+PcGc5wZPvFdOS5EUv7cJMaFZCka18ixT7wLONcTok16LIPlyM/oCYEBZNx3XHu+Xx4XQsK2tJJnnW50FgENS21Tjc1CdU+9Z4r/deoPcx/hwKmdFbCBnt2q77rwGfg8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L0tiDpRw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="L0tiDpRw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF526C4AF1A; Thu, 13 Jun 2024 11:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718279944; bh=saqYJz0hyELiCrjLdIUmq1hpMqjaStEPkGHOgDafA7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L0tiDpRwPmP+HxKYqzpiq5a1ZPTWr/JMQXOHBD0Pc3NMXqZvG0MBBPrTPu/NtIir3 KfazX7r324iewJlU1ON383lGbuDmmhrnQ4G+SAP/DZ8dSa13tZtsVskz6ySmeOJlAR dV9gfbuSk5ICa4u8+3ifnw6gzAxqQ+PPiaY7goGI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 058/202] net: usb: sr9700: stop lying about skb->truesize Date: Thu, 13 Jun 2024 13:32:36 +0200 Message-ID: <20240613113230.016134243@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113227.759341286@linuxfoundation.org> References: <20240613113227.759341286@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 05417aa9c0c038da2464a0c504b9d4f99814a23b ] Some usb drivers set small skb->truesize and break core networking stacks. In this patch, I removed one of the skb->truesize override. I also replaced one skb_clone() by an allocation of a fresh and small skb, to get minimally sized skbs, like we did in commit 1e2c61172342 ("net: cdc_ncm: reduce skb truesize in rx path") and 4ce62d5b2f7a ("net: usb: ax88179_178a: stop lying about skb->truesize") Fixes: c9b37458e956 ("USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support") Signed-off-by: Eric Dumazet Link: https://lore.kernel.org/r/20240506143939.3673865-1-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/usb/sr9700.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c index 811c8751308c6..3fac642bec772 100644 --- a/drivers/net/usb/sr9700.c +++ b/drivers/net/usb/sr9700.c @@ -418,19 +418,15 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb) skb_pull(skb, 3); skb->len = len; skb_set_tail_pointer(skb, len); - skb->truesize = len + sizeof(struct sk_buff); return 2; } - /* skb_clone is used for address align */ - sr_skb = skb_clone(skb, GFP_ATOMIC); + sr_skb = netdev_alloc_skb_ip_align(dev->net, len); if (!sr_skb) return 0; - sr_skb->len = len; - sr_skb->data = skb->data + 3; - skb_set_tail_pointer(sr_skb, len); - sr_skb->truesize = len + sizeof(struct sk_buff); + skb_put(sr_skb, len); + memcpy(sr_skb->data, skb->data + 3, len); usbnet_skb_return(dev, sr_skb); skb_pull(skb, len + SR_RX_OVERHEAD); -- 2.43.0