From patchwork Thu Aug 23 06:51:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 144890 Delivered-To: patch@linaro.org Received: by 2002:a2e:164a:0:0:0:0:0 with SMTP id 10-v6csp757662ljw; Wed, 22 Aug 2018 23:52:10 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxUUSSMlfuVNvN7OiOXjYknQFwnqQUv1EgYl9KcWqa7jjV8CbqWOjyso+nD6pRxjO5qtrfr X-Received: by 2002:a17:902:2f43:: with SMTP id s61-v6mr56002591plb.176.1535007130609; Wed, 22 Aug 2018 23:52:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535007130; cv=none; d=google.com; s=arc-20160816; b=Ql1Cf+SQnrALDvAsFcrragLKVJwF1hT7RnEZYbv8Q0YHhufxOqrOIGX/OdLmP8mfeb kTsOnt4G+knzhJFVkL9ZYWZlHbrO73Zji7v2M7XRmdRJd/M6td+Kf8n+vK32OEqYIJPU yzsNG4k8NVP1XwL2XSZdYM6tuN9GZagtvU1+SDcC1KpnzeYYzngXFtyN77mZn2MJxHmU Wlqwkn+nMKGXHpNBnpyeIjm41NZmg8paKw4OeaY9wVV5UCFd1KCmFRvMbMGZJUkSZ9Y2 hzlEJKDhrKENk3f9sqaEmda8yYQoIap7rFpa87gzvwOgbwggFBGgtvrS1e5/a5K2oAV2 DRHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=8EvYZpG55yMb3RV9RLTPZQQ0d3uJk4fPbb/sOy7Qi1k=; b=GASRK4XY9bknyfmuP6WJcYtqAKuWmYcNqJGHePP+VVSwmBxC7zfzp9nQmVDJNZ7RjM qMQNgdvERvTUpcVKyaRinnIWvZ3/CP9Tia2GXUcbUPdfB3rmbX95FnzGPTeEsFXeb13u TRBnF8IfZ/+anltZSiNbSXvwCazrb+09KTBL/s3jxdbNt7/y/eFDT1UPH5EzTfpmUSvh cl//DfsLRswisGsrmUYf7g3ocOYtsTvhzi881ZkrVTx9kq371r/wzs7aRWlRFp6uWvad 2sZRJiDnkv+9E8MRYfYm6UVIgItt1IWQvpq0/R8pj49p2VRZbAvo4tYtoBRVaCZzKEzO QENw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c+ySGmhS; 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 cf13-v6si3685258plb.334.2018.08.22.23.52.10; Wed, 22 Aug 2018 23:52:10 -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=c+ySGmhS; 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 S1726268AbeHWKUT (ORCPT + 13 others); Thu, 23 Aug 2018 06:20:19 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45962 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726068AbeHWKUS (ORCPT ); Thu, 23 Aug 2018 06:20:18 -0400 Received: by mail-pg1-f196.google.com with SMTP id m4-v6so1571485pgv.12 for ; Wed, 22 Aug 2018 23:52:09 -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:in-reply-to:references; bh=8EvYZpG55yMb3RV9RLTPZQQ0d3uJk4fPbb/sOy7Qi1k=; b=c+ySGmhSDWz/mv8Su8XclnV8sN1vSaEFZDPeshA8mXJdadzT3bwyEaxtdVt3Hyde7w ookkfKjn/5lyy1nPHpjE276zNNHnbM4bn57NTW0u8v1Y/xU5CAPqzNi6aU9qAeDIDTIr 5WYmBv5JKcfYaZjVJRe0C4J6hGPREBhVY3Hl0= 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:in-reply-to :references; bh=8EvYZpG55yMb3RV9RLTPZQQ0d3uJk4fPbb/sOy7Qi1k=; b=BsO8TVJ/Ytt/XCLWR75aE3FhT4c5cksDFetLGc6FA52YUMoFO1F5Z4i0twYDuFkZpV U5TZ8Td7S4zlRXQYALSc9mfnFe/qFtEAyV3bjZFpAtdVvP/htssApuaxDtYpNN+7AzlN Q2dOcav28r5gOp0Q2Kje4vPTD9cWD+xfeZ1NE4KVQbWBjjK63gqIXUOO9+RJePT3iiE+ mA35S/2tKeja3y3kelYPXNl8kSLDB5BLw1v5I977SqkHPlVauifRBF15/e9cA1tIlOiA Yz2yZoLYGkWsPTxeGFUr+/UWGE1YSgiWmzjVTe7iI5A/NX3BKQjy65DDFptESyo0vi5R VKBQ== X-Gm-Message-State: AOUpUlE8tV8MlqPo88foPSMm3WYt2nPd81prnKZjxodu8CUwxNQp2LGU 9vY3Yt3un2nlOEMgSYSKYIrvLA== X-Received: by 2002:a63:454d:: with SMTP id u13-v6mr12503042pgk.342.1535007129115; Wed, 22 Aug 2018 23:52:09 -0700 (PDT) Received: from localhost.localdomain ([49.207.48.21]) by smtp.gmail.com with ESMTPSA id d132-v6sm7559932pgc.93.2018.08.22.23.52.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Aug 2018 23:52:07 -0700 (PDT) From: Amit Pundir To: Greg KH , Nikolay Aleksandrov Cc: "David S . Miller" , Stable Subject: [PATCH v2 for-4.4.y 3/5] sch_hhf: fix null pointer dereference on init failure Date: Thu, 23 Aug 2018 12:21:54 +0530 Message-Id: <1535007116-31801-4-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535007116-31801-1-git-send-email-amit.pundir@linaro.org> References: <1535007116-31801-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nikolay Aleksandrov commit 32db864d33c21fd70a217ba53cb7224889354ffb upstream. If sch_hhf fails in its ->init() function (either due to wrong user-space arguments as below or memory alloc failure of hh_flows) it will do a null pointer deref of q->hh_flows in its ->destroy() function. To reproduce the crash: $ tc qdisc add dev eth0 root hhf quantum 2000000 non_hh_weight 10000000 Crash log: [ 690.654882] BUG: unable to handle kernel NULL pointer dereference at (null) [ 690.655565] IP: hhf_destroy+0x48/0xbc [ 690.655944] PGD 37345067 [ 690.655948] P4D 37345067 [ 690.656252] PUD 58402067 [ 690.656554] PMD 0 [ 690.656857] [ 690.657362] Oops: 0000 [#1] SMP [ 690.657696] Modules linked in: [ 690.658032] CPU: 3 PID: 920 Comm: tc Not tainted 4.13.0-rc6+ #57 [ 690.658525] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 690.659255] task: ffff880058578000 task.stack: ffff88005acbc000 [ 690.659747] RIP: 0010:hhf_destroy+0x48/0xbc [ 690.660146] RSP: 0018:ffff88005acbf9e0 EFLAGS: 00010246 [ 690.660601] RAX: 0000000000000000 RBX: 0000000000000020 RCX: 0000000000000000 [ 690.661155] RDX: 0000000000000000 RSI: 0000000000000001 RDI: ffffffff821f63f0 [ 690.661710] RBP: ffff88005acbfa08 R08: ffffffff81b10a90 R09: 0000000000000000 [ 690.662267] R10: 00000000f42b7019 R11: ffff880058578000 R12: 00000000ffffffea [ 690.662820] R13: ffff8800372f6400 R14: 0000000000000000 R15: 0000000000000000 [ 690.663769] FS: 00007f8ae5e8b740(0000) GS:ffff88005d980000(0000) knlGS:0000000000000000 [ 690.667069] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 690.667965] CR2: 0000000000000000 CR3: 0000000058523000 CR4: 00000000000406e0 [ 690.668918] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 690.669945] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 690.671003] Call Trace: [ 690.671743] qdisc_create+0x377/0x3fd [ 690.672534] tc_modify_qdisc+0x4d2/0x4fd [ 690.673324] rtnetlink_rcv_msg+0x188/0x197 [ 690.674204] ? rcu_read_unlock+0x3e/0x5f [ 690.675091] ? rtnl_newlink+0x729/0x729 [ 690.675877] netlink_rcv_skb+0x6c/0xce [ 690.676648] rtnetlink_rcv+0x23/0x2a [ 690.677405] netlink_unicast+0x103/0x181 [ 690.678179] netlink_sendmsg+0x326/0x337 [ 690.678958] sock_sendmsg_nosec+0x14/0x3f [ 690.679743] sock_sendmsg+0x29/0x2e [ 690.680506] ___sys_sendmsg+0x209/0x28b [ 690.681283] ? __handle_mm_fault+0xc7d/0xdb1 [ 690.681915] ? check_chain_key+0xb0/0xfd [ 690.682449] __sys_sendmsg+0x45/0x63 [ 690.682954] ? __sys_sendmsg+0x45/0x63 [ 690.683471] SyS_sendmsg+0x19/0x1b [ 690.683974] entry_SYSCALL_64_fastpath+0x23/0xc2 [ 690.684516] RIP: 0033:0x7f8ae529d690 [ 690.685016] RSP: 002b:00007fff26d2d6b8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 690.685931] RAX: ffffffffffffffda RBX: ffffffff810d278c RCX: 00007f8ae529d690 [ 690.686573] RDX: 0000000000000000 RSI: 00007fff26d2d700 RDI: 0000000000000003 [ 690.687047] RBP: ffff88005acbff98 R08: 0000000000000001 R09: 0000000000000000 [ 690.687519] R10: 00007fff26d2d480 R11: 0000000000000246 R12: 0000000000000002 [ 690.687996] R13: 0000000001258070 R14: 0000000000000001 R15: 0000000000000000 [ 690.688475] ? trace_hardirqs_off_caller+0xa7/0xcf [ 690.688887] Code: 00 00 e8 2a 02 ae ff 49 8b bc 1d 60 02 00 00 48 83 c3 08 e8 19 02 ae ff 48 83 fb 20 75 dc 45 31 f6 4d 89 f7 4d 03 bd 20 02 00 00 <49> 8b 07 49 39 c7 75 24 49 83 c6 10 49 81 fe 00 40 00 00 75 e1 [ 690.690200] RIP: hhf_destroy+0x48/0xbc RSP: ffff88005acbf9e0 [ 690.690636] CR2: 0000000000000000 Fixes: 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation") Fixes: 10239edf86f1 ("net-qdisc-hhf: Heavy-Hitter Filter (HHF) qdisc") Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Amit Pundir --- net/sched/sch_hhf.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c index 45d4b2f22f62..aff2a1b46f7f 100644 --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -501,6 +501,9 @@ static void hhf_destroy(struct Qdisc *sch) hhf_free(q->hhf_valid_bits[i]); } + if (!q->hh_flows) + return; + for (i = 0; i < HH_FLOWS_CNT; i++) { struct hh_flow_state *flow, *next; struct list_head *head = &q->hh_flows[i];