{"id":807544,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807544/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<1504086545-7777-9-git-send-email-nikolay@cumulusnetworks.com>","date":"2017-08-30T09:49:04","name":"[net,8/9] sch_sfq: fix null pointer dereference on init failure","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"93043b4c84c5cc64261ea3a030fe986960acde36","submitter":{"id":66448,"url":"http://patchwork.ozlabs.org/api/1.0/people/66448/?format=json","name":"Nikolay Aleksandrov","email":"nikolay@cumulusnetworks.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504086545-7777-9-git-send-email-nikolay@cumulusnetworks.com/mbox/","series":[{"id":565,"url":"http://patchwork.ozlabs.org/api/1.0/series/565/?format=json","date":"2017-08-30T09:48:56","name":"net/sched: init failure fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/565/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807544/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=cumulusnetworks.com\n\theader.i=@cumulusnetworks.com header.b=\"doB2qUGZ\"; \n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xj1276ZWHz9sNn\n\tfor ;\n\tWed, 30 Aug 2017 19:49:51 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751951AbdH3Jto (ORCPT );\n\tWed, 30 Aug 2017 05:49:44 -0400","from mail-wr0-f181.google.com ([209.85.128.181]:38198 \"EHLO\n\tmail-wr0-f181.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751933AbdH3Jtc (ORCPT\n\t); Wed, 30 Aug 2017 05:49:32 -0400","by mail-wr0-f181.google.com with SMTP id 40so16418504wrv.5\n\tfor ; Wed, 30 Aug 2017 02:49:31 -0700 (PDT)","from debil.mediahub-bg.com (46-10-142-144.ip.btc-net.bg.\n\t[46.10.142.144]) by smtp.gmail.com with ESMTPSA id\n\to206sm1113294wmo.10.2017.08.30.02.49.29\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 30 Aug 2017 02:49:29 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=cumulusnetworks.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=uexn86NrVy5TGrBF7EpH79VbFwwnEOfTxhxIcqrY5Gs=;\n\tb=doB2qUGZXbaABIF9gKwTf3Ay5u56cdbGnagIXM5PucdWO/A6wVIZt6a2k7tN9uelik\n\tFODms8mbGJRGyQSJJ95Krd3fs0xqF+eQ1I0g6IZ0l2qAspcE0ewHH1zaCh5/enHgjjz9\n\tLEdDME0jUAL/2MBC7j5YVavgcB7j/Dmx2SLH4=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=uexn86NrVy5TGrBF7EpH79VbFwwnEOfTxhxIcqrY5Gs=;\n\tb=pSifT7K0j8RmGYiX9I4FCg/ekg+eqhBW0+eFsL+xpnEuSGzmUvgMbGxndSJXvGmStk\n\tryITocC2HgSR4jDeLFAmMrTNm5oZbIOSeAhh/o/bKCn51QX+cJw7r9a/WlYSm6dIzzbQ\n\tQlgxKWlVD3ScglT0160v/io4wRNLIVeMCDeHvcJOxz4NU5ftHzFhqEp7OsoidSJZGVC/\n\tFElLYF3mte5CW5MkMag8n4iLFNDccK4fDv+3evsxGfy+b2i07oGyaO77yiqadv9FBLIQ\n\tnGcAIQAlXOmrFFRZ3nbwiLTGQMDrgUHlPSjs2lOjAHkqBgdJQYDIIR/+yoNCM1dtIWFG\n\t+P4Q==","X-Gm-Message-State":"AHYfb5g9zeu8WJDoCLgMUW3xOfViCU3uMDBUBoRqtIhqzDu3VtCSIQcH\n\twS/bHssjwRdPQP7HzXM=","X-Received":"by 10.223.136.196 with SMTP id g4mr663998wrg.100.1504086570737; \n\tWed, 30 Aug 2017 02:49:30 -0700 (PDT)","From":"Nikolay Aleksandrov ","To":"netdev@vger.kernel.org","Cc":"edumazet@google.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com,\n\tjiri@resnulli.us, roopa@cumulusnetworks.com,\n\tNikolay Aleksandrov ","Subject":"[PATCH net 8/9] sch_sfq: fix null pointer dereference on init\n\tfailure","Date":"Wed, 30 Aug 2017 12:49:04 +0300","Message-Id":"<1504086545-7777-9-git-send-email-nikolay@cumulusnetworks.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504086545-7777-1-git-send-email-nikolay@cumulusnetworks.com>","References":"<1504086545-7777-1-git-send-email-nikolay@cumulusnetworks.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Currently only a memory allocation failure can lead to this, so let's\ninitialize the timer first.\n\nFixes: 6529eaba33f0 (\"net: sched: introduce tcf block infractructure\")\nSigned-off-by: Nikolay Aleksandrov \n---\n net/sched/sch_sfq.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c\nindex 82469ef9655e..fc69fc5956e9 100644\n--- a/net/sched/sch_sfq.c\n+++ b/net/sched/sch_sfq.c\n@@ -716,13 +716,13 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt)\n \tint i;\n \tint err;\n \n+\tsetup_deferrable_timer(&q->perturb_timer, sfq_perturbation,\n+\t\t\t (unsigned long)sch);\n+\n \terr = tcf_block_get(&q->block, &q->filter_list);\n \tif (err)\n \t\treturn err;\n \n-\tsetup_deferrable_timer(&q->perturb_timer, sfq_perturbation,\n-\t\t\t (unsigned long)sch);\n-\n \tfor (i = 0; i < SFQ_MAX_DEPTH + 1; i++) {\n \t\tq->dep[i].next = i + SFQ_MAX_FLOWS;\n \t\tq->dep[i].prev = i + SFQ_MAX_FLOWS;\n","prefixes":["net","8/9"]}