From patchwork Tue Jul 31 18:40:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 143203 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5668157ljj; Tue, 31 Jul 2018 11:40:12 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeatSwF7mCz+N1wabW7F1UCKWvujE4IqXpg+fJVXAahxwC1MpQP/U8dKPTOCXKaZugZgZSB X-Received: by 2002:a17:902:4601:: with SMTP id o1-v6mr19611989pld.202.1533062412606; Tue, 31 Jul 2018 11:40:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533062412; cv=none; d=google.com; s=arc-20160816; b=TosRmvOQ1tFb7l4vr9aQxBvKk8zD3u4BleNNDTaF8dtyahaownzZdOhhNAsKs74aGI Gr5vqDdDcuVb5E4W/Lonsqs53J6ZM+DtWvBI+F7b2sIT3tCS5kjDdFlDb5tlyP2C1eRC vHom7DewxKmB7hztbO/FmT/22Ad49FCbrM3CeovCK6oNv13pO+JLnJFuMUgMgtqDen+J /mihgtSprrNg7oQKnnPCvjr3CfCpfCypP3r4pKhGrCtsI2RBCTxXcfr7SzpyGitKfHU7 cQH1JwjW3DhPFqyjsei2sPo8Xj3QAfdxveAOaw4C97Hpw6koksYFZIUO1W+GoC2GjnXj gPQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=8gIr6vsQ60Vv1M/WXiFJ6A2qvxB0Ukh1bWawVDiqc4A=; b=j5AIDLVmmdfOYda1SvXuzZPin3a4YMDjhbH/zAsqHrQGW9mOf7N67hsi3t2txmD91z 8rb/Vx3EIp0DkPPaKxyaVnvh0e9t1goe84v71b8Av54P6QJMg88UEODQ9CIveWSsY73R MpCjRnY+RUzcj/E3XUpuMpNEYtiRsl1VmkC2G9aAMS3ykvK3qqP77Z3h+0NivqTf2dFx OCoKsEYp4AOKnSylqrTogRfLBrFlBEJEILV7X5doVKth1v+L3vICyVbNYm/TeCpagoaw AHv0YRU90xtWQV/zJ+zcLYgLq1We+SshRSqYm+0LfDTZdf+rQxVnx+CvRWZ1wmE4fee2 lbXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gaedwwUo; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x3-v6si13746391pgo.542.2018.07.31.11.40.12; Tue, 31 Jul 2018 11:40:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gaedwwUo; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729767AbeGaUVq (ORCPT + 13 others); Tue, 31 Jul 2018 16:21:46 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:33500 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729645AbeGaUVq (ORCPT ); Tue, 31 Jul 2018 16:21:46 -0400 Received: by mail-pg1-f193.google.com with SMTP id r5-v6so9519901pgv.0 for ; Tue, 31 Jul 2018 11:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=8gIr6vsQ60Vv1M/WXiFJ6A2qvxB0Ukh1bWawVDiqc4A=; b=gaedwwUo7FE7v6+hjrx0jP+AJ+amC4NMbO+A323wluX9vPSSAzBCnjSVhIIeJ0hoLc ezjMDKi5HPIa0ta0JdIZ5g2U4kVzs2MJoCXFFGsAWyUP/URECnLl0+Xhr+8QE5sGmIDA yy0lsNwdHiKLA3U1Ri3D3auTcNP6foSDGgGbA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8gIr6vsQ60Vv1M/WXiFJ6A2qvxB0Ukh1bWawVDiqc4A=; b=qD/szsMTkIAKtSczYwke1mPzYa1X2FZnfgCJXsY9slXm2ds38W0csTVIHPoI8rRLFx KVSRIB6rFcYIBl4SjUPaI7xf59uC/gm8MydFMZS0iO8DYMUNhUJfjbDQn7GtI2WGZX8B yQ9AdyeS0CscV0MSzODBzQ60YDnUTfTRPIjrkj6WHN8bZkltD/OuCwclTQxmUcFfYAUR rT92IUYtXpBpKQWL21EKJ9ISc22y+ASKlPyW/tNjakzBtTfBYd3CuajWcS6jCCBh6Mla fCoNXkB8os3P6fkBwE9MVRFEwU2++mmvLnAF+j0EzTYDur5qehpJkCShuLYWqe/BKQ+v htDA== X-Gm-Message-State: AOUpUlHseeyE4r5yVV/0Wt5c9xGnl7dqJ/f1iTY94k4Sy3Me7kYy6Q6i SU3Jk4YUB9FZhgs5hi7bl7Og/Q== X-Received: by 2002:a63:d309:: with SMTP id b9-v6mr21424019pgg.163.1533062410723; Tue, 31 Jul 2018 11:40:10 -0700 (PDT) Received: from localhost.localdomain ([106.51.18.123]) by smtp.gmail.com with ESMTPSA id d191-v6sm15467977pfg.172.2018.07.31.11.40.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Jul 2018 11:40:09 -0700 (PDT) From: Amit Pundir To: Greg KH , Nikolay Aleksandrov Cc: "David S . Miller" , Stable Subject: [PATCH for-4.9.y 0/5] net/sched: init failure fixes Date: Wed, 1 Aug 2018 00:10:00 +0530 Message-Id: <1533062405-32524-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Hi Greg, Kindly consider/review following net/sched fixes for stable 4.9.y. This patchset is a follow-up of upstream fix 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation") cherry-picked on stable 4.9.y. It fix null pointer dereferences due to uninitialized timer (qdisc watchdog) or double frees due to ->destroy cleaning up a second time. Here is the original submission https://www.mail-archive.com/netdev@vger.kernel.org/msg186003.html Cherry-picked and build tested on Linux 4.9.116 for ARCH=arm/arm64. These fixes are applicable for stable 4.4.y kernel as well, but one of the patches needed a minor rebasing, so I'm resending this series for 4.4.y in a separate thread to avoid any confusion. Regards, Amit Pundir Nikolay Aleksandrov (5): sch_htb: fix crash on init failure sch_multiq: fix double free on init failure sch_hhf: fix null pointer dereference on init failure sch_netem: avoid null pointer deref on init failure sch_tbf: fix two null pointer dereferences on init failure net/sched/sch_hhf.c | 3 +++ net/sched/sch_htb.c | 5 +++-- net/sched/sch_multiq.c | 7 +------ net/sched/sch_netem.c | 4 ++-- net/sched/sch_tbf.c | 5 +++-- 5 files changed, 12 insertions(+), 12 deletions(-) -- 2.7.4