Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp481806imn; Wed, 27 Jul 2022 11:25:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vU2iAl7Kq0NZxXG9L07dOmj10cd2yZZPMqtfaHajbhzk9kQr43BsLCg6SKfbZHGy7gfXRO X-Received: by 2002:a17:907:7b87:b0:72e:d45a:17af with SMTP id ne7-20020a1709077b8700b0072ed45a17afmr18727143ejc.73.1658946321776; Wed, 27 Jul 2022 11:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946321; cv=none; d=google.com; s=arc-20160816; b=NUSadSY6TepxItxzarm178aZHw4uptBk44i1MnfisMljoOnH8Qa3+mupRygZ+1NT19 Z3DSDW8heIUfwSm99ToZ1vqi6H+d4PWN8kKmYu293SDJrexAUv/kmydiaUxKj98+YrvS arS5/rm1q5TxvtGP5o/+1urZaWQLwAWt363gz8B8Tsj6WDPKMCdehrAom0/kYQ9eyX8D DBSpZ4tgYVnurRRWO6/pHpuWrz1U8b0NL4c50xU4hGNi1M6e5VXausPIK0sEdscAAJnF g7RM8S4svd8sFnFcxPmwRITEvj7pIP317hs90dGx3vxDKTs2BHVAdVKfabdDyMuTRp7x MPZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XVE9DEk/47Qmsjlj+fChjOrorL2/akUMcNkgc/PmCLU=; b=BvlrNoEmMwdWqfUnHUHPrOnvBJCsL3VVZePGxdTGUPkqFspIJukYgIQHDM3FAMh+3T INDkA5J2yL11WDgI5nzDODK7yi2F+bGj06gGaJXDyNDoO8+Kcc8N4v2uZATa5jxTjqUJ /erE7nMt5nL0WYf2+D/1yjXI8q9QDzMp+NdBQ208oEOyL5RmuNmlgidGK+QhEFqO9m3k WcuLhSkUbEHUlJeWr0zr7+dGYF9T4q4Pf2REEWiRHTHUi+Vc3vmKMMQfrbOuH8YdcVhq 8hwtitKJyvN74D9n7ZylCZQ0TehU+Q69ubBjL8aD4oOwXnPqzmeJc/0NObbPNhQyJu8c oxmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hJfndZcV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j29-20020a056402239d00b0043bc859f01bsi17659750eda.186.2022.07.27.11.24.57; Wed, 27 Jul 2022 11:25:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hJfndZcV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241198AbiG0Q6n (ORCPT + 99 others); Wed, 27 Jul 2022 12:58:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241170AbiG0Q6N (ORCPT ); Wed, 27 Jul 2022 12:58:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B20A466BB3; Wed, 27 Jul 2022 09:36:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 08F78B821B6; Wed, 27 Jul 2022 16:36:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5559EC433D6; Wed, 27 Jul 2022 16:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658939802; bh=h6k8ja6jrl5KWyFSSA41/040OlijOASIOH7TtWmIBKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hJfndZcVyx/9CAt9JbJCkABZPqQL3FyI0ZcqbVep0nfEZ5cocq1wGv4uFZyjSodh5 RKpj89ADTY0TVsDVmTJyvKVNAQoWlUyQywW2gn59jo1dvP/IjZh5Z7EPuQHTZxy52K IvqnQhpZjxvGenBK6vwFfL5zLbdv24HSB7goiq84= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Menzel , Luiz Augusto von Dentz , Marcel Holtmann , Harshit Mogalapalli Subject: [PATCH 5.10 093/105] Bluetooth: Fix bt_skb_sendmmsg not allocating partial chunks Date: Wed, 27 Jul 2022 18:11:19 +0200 Message-Id: <20220727161015.837140827@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727161012.056867467@linuxfoundation.org> References: <20220727161012.056867467@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luiz Augusto von Dentz commit 29fb608396d6a62c1b85acc421ad7a4399085b9f upstream. Since bt_skb_sendmmsg can be used with the likes of SOCK_STREAM it shall return the partial chunks it could allocate instead of freeing everything as otherwise it can cause problems like bellow. Fixes: 81be03e026dc ("Bluetooth: RFCOMM: Replace use of memcpy_from_msg with bt_skb_sendmmsg") Reported-by: Paul Menzel Link: https://lore.kernel.org/r/d7206e12-1b99-c3be-84f4-df22af427ef5@molgen.mpg.de BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=215594 Signed-off-by: Luiz Augusto von Dentz Tested-by: Paul Menzel (Nokia N9 (MeeGo/Harmattan) Signed-off-by: Marcel Holtmann Cc: Harshit Mogalapalli Signed-off-by: Greg Kroah-Hartman --- include/net/bluetooth/bluetooth.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -475,8 +475,7 @@ static inline struct sk_buff *bt_skb_sen tmp = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom); if (IS_ERR(tmp)) { - kfree_skb(skb); - return tmp; + return skb; } len -= tmp->len;