From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACCF1C7618B for ; Fri, 26 Jul 2019 15:27:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8421C22CBD for ; Fri, 26 Jul 2019 15:27:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154826; bh=rbmPEqUUcl/wlt099QfNtk2/i8LmNqOED1v/faG9biA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iBJml1tXxOaEEwOcG/e5GpujCWih7rZvuXpyHEAPdB52B6mO/NRYcahQ1gCaC1Eov CZ5JxFkBwrLc+fJlEJikGuMCjOqf7HeLO5GymA2Jw4eYrjyiAuvrAqpcp2o3xresNU Og5pYap/5bNf4A/fMoeZ+sEdNuEwK8gq/F5cALj8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388191AbfGZP1E (ORCPT ); Fri, 26 Jul 2019 11:27:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:41112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388169AbfGZP1A (ORCPT ); Fri, 26 Jul 2019 11:27:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5AC96218D4; Fri, 26 Jul 2019 15:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154819; bh=rbmPEqUUcl/wlt099QfNtk2/i8LmNqOED1v/faG9biA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HM40QV1u7svBGaDrt3JX5g2szAU3DJzQnjY5Zrq0p7mtnqV+L/85XAq7ZvAB4yxjh QW/7Fz6xjlkjHfke4RWl+cQRD00O7zcWePt2pAkHjqL5Td1xbADVlsCaQqtIpfd9iE 43B3EBBEGoMGwY6SdxypfnDTay57bH1RCCHha4cw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ralf Baechle , Cong Wang , "David S. Miller" , syzbot+622bdabb128acc33427d@syzkaller.appspotmail.com, syzbot+6eaef7158b19e3fec3a0@syzkaller.appspotmail.com, syzbot+9399c158fcc09b21d0d2@syzkaller.appspotmail.com, syzbot+a34e5f3d0300163f0c87@syzkaller.appspotmail.com Subject: [PATCH 5.2 35/66] netrom: hold sock when setting skb->destructor Date: Fri, 26 Jul 2019 17:24:34 +0200 Message-Id: <20190726152305.819805063@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190726152301.936055394@linuxfoundation.org> References: <20190726152301.936055394@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cong Wang [ Upstream commit 4638faac032756f7eab5524be7be56bee77e426b ] sock_efree() releases the sock refcnt, if we don't hold this refcnt when setting skb->destructor to it, the refcnt would not be balanced. This leads to several bug reports from syzbot. I have checked other users of sock_efree(), all of them hold the sock refcnt. Fixes: c8c8218ec5af ("netrom: fix a memory leak in nr_rx_frame()") Reported-and-tested-by: Reported-and-tested-by: Reported-and-tested-by: Reported-and-tested-by: Cc: Ralf Baechle Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/netrom/af_netrom.c | 1 + 1 file changed, 1 insertion(+) --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -967,6 +967,7 @@ int nr_rx_frame(struct sk_buff *skb, str window = skb->data[20]; + sock_hold(make); skb->sk = make; skb->destructor = sock_efree; make->sk_state = TCP_ESTABLISHED;