From patchwork Mon Aug 9 22:18:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 61322 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 652C4B70D9 for ; Tue, 10 Aug 2010 08:18:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757216Ab0HIWSy (ORCPT ); Mon, 9 Aug 2010 18:18:54 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:53373 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757160Ab0HIWSx (ORCPT ); Mon, 9 Aug 2010 18:18:53 -0400 Received: by mail-bw0-f46.google.com with SMTP id 3so1537659bwz.19 for ; Mon, 09 Aug 2010 15:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=RObQkV3dxcgdiBRV886oeXq3bW5ktlxja/lZfdRi6Hg=; b=b8E2LGfnkdxy7DII3LxfMteqrcL1uVEsPg3W4id6GRNBaaeuYiPRO19UTpcV2f83q0 HCK3gDedPO5LAYovLhxJUD6zUE+8Mwtj1jmmiPgQNufFCNlfH/As/wm/2sk4ViY4d3IK DDJCTyZztOYzL53yt5dwSFOnZN2cJAEoP+Q5s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=GAsesMp+HTl0mx3uYYq8BOa/kKaXpskgpdVypJhfAkCfcoxNyOVQ0Z2Ld3C9m1IAOb SK8hRq2iSe2noZkSSIEqx8ZYFS84+KMQ5+d6Beic416lMLV26MTzceM4C4Yzc+dUUYgv YkPtyqujkq8GgbpcONdAazt4wU6bSZYBNwnus= Received: by 10.204.156.200 with SMTP id y8mr3423697bkw.183.1281392332471; Mon, 09 Aug 2010 15:18:52 -0700 (PDT) Received: from del.dom.local (public79908.xdsl.centertel.pl [79.162.184.36]) by mx.google.com with ESMTPS id y2sm3678762bkx.20.2010.08.09.15.18.50 (version=SSLv3 cipher=RC4-MD5); Mon, 09 Aug 2010 15:18:51 -0700 (PDT) Date: Tue, 10 Aug 2010 00:18:48 +0200 From: Jarek Poplawski To: Franchoze Eric Cc: David Miller , shemminger@vyatta.com, netdev@vger.kernel.org Subject: [PATCH 2/2] pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles Message-ID: <20100809221848.GB18629@del.dom.local> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Verify in register_qdisc() some basic qdisc class handlers are present. Signed-off-by: Jarek Poplawski --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index b9e8c3b..8ed2f56 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -150,22 +150,34 @@ int register_qdisc(struct Qdisc_ops *qops) if (qops->enqueue == NULL) qops->enqueue = noop_qdisc_ops.enqueue; if (qops->peek == NULL) { - if (qops->dequeue == NULL) { + if (qops->dequeue == NULL) qops->peek = noop_qdisc_ops.peek; - } else { - rc = -EINVAL; - goto out; - } + else + goto out_einval; } if (qops->dequeue == NULL) qops->dequeue = noop_qdisc_ops.dequeue; + if (qops->cl_ops) { + const struct Qdisc_class_ops *cops = qops->cl_ops; + + if (!(cops->get && cops->put)) + goto out_einval; + + if (cops->tcf_chain && !(cops->bind_tcf && cops->unbind_tcf)) + goto out_einval; + } + qops->next = NULL; *qp = qops; rc = 0; out: write_unlock(&qdisc_mod_lock); return rc; + +out_einval: + rc = -EINVAL; + goto out; } EXPORT_SYMBOL(register_qdisc);