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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 22EB5C47082 for ; Thu, 3 Jun 2021 17:13:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0884561401 for ; Thu, 3 Jun 2021 17:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232838AbhFCRPG (ORCPT ); Thu, 3 Jun 2021 13:15:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:42858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232474AbhFCRLS (ORCPT ); Thu, 3 Jun 2021 13:11:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 84E5E6140D; Thu, 3 Jun 2021 17:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622740173; bh=yyU/fJtD+w13WEFOAr/V45hGnvEBtIwtaATU9ogGeeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nnJo9uzGWrciG/KLE0atuRGYWVrajwJQJRtVFREmLFoP2uqOM0mKR9qypqtsEVbdx GjGC6vcrb/QfrcCZPFJPw7Y+8WoY4Dmb/xSAFPFb/gLGfXOEHvs6tqSnk22nsqI9zv 0Q03fkTCOLDJdvUZSHBVsIhyin8YM4PHv9G1iy0f6S13ut5zf2Z7fsA+qAc0cDeCG/ i/Z9Mi5vQg0B3nGMwthtsRsNX+rnA0l8WhQ9CXov0cmpuu1R6GJdXR0MVzHA+M3qdu 99ureTD4bmKVe6nfBVK2HnV6h5Ubmouf49+guN7gUEPgar+SYbmv9ocjosdPHr4fPA gufrWs0zXkRNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , syzbot+bfda097c12a00c8cae67@syzkaller.appspotmail.com, Jay Vosburgh , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 11/31] bonding: init notify_work earlier to avoid uninitialized use Date: Thu, 3 Jun 2021 13:08:59 -0400 Message-Id: <20210603170919.3169112-11-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210603170919.3169112-1-sashal@kernel.org> References: <20210603170919.3169112-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit 35d96e631860226d5dc4de0fad0a415362ec2457 ] If bond_kobj_init() or later kzalloc() in bond_alloc_slave() fail, then we call kobject_put() on the slave->kobj. This in turn calls the release function slave_kobj_release() which will always try to cancel_delayed_work_sync(&slave->notify_work), which shouldn't be done on an uninitialized work struct. Always initialize the work struct earlier to avoid problems here. Syzbot bisected this down to a completely pointless commit, some fault injection may have been at work here that caused the alloc failure in the first place, which may interact badly with bisect. Reported-by: syzbot+bfda097c12a00c8cae67@syzkaller.appspotmail.com Signed-off-by: Johannes Berg Acked-by: Jay Vosburgh Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 2bc4cb9e3095..e21643377162 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1335,6 +1335,7 @@ static struct slave *bond_alloc_slave(struct bonding *bond, slave->bond = bond; slave->dev = slave_dev; + INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work); if (bond_kobj_init(slave)) return NULL; @@ -1347,7 +1348,6 @@ static struct slave *bond_alloc_slave(struct bonding *bond, return NULL; } } - INIT_DELAYED_WORK(&slave->notify_work, bond_netdev_notify_work); return slave; } -- 2.30.2