--- net/sched/sch_cbq.c.orig	2004-04-12 00:24:08.123743284 +0200
+++ net/sched/sch_cbq.c	2004-04-12 00:40:30.186534165 +0200
@@ -1399,7 +1399,8 @@ static int cbq_init(struct Qdisc *sch, s
 	struct rtattr *tb[TCA_CBQ_MAX];
 	struct tc_ratespec *r;
 
-	if (rtattr_parse(tb, TCA_CBQ_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt)) < 0 ||
+	if (!opt || 
+	    rtattr_parse(tb, TCA_CBQ_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt)) < 0 ||
 	    tb[TCA_CBQ_RTAB-1] == NULL || tb[TCA_CBQ_RATE-1] == NULL ||
 	    RTA_PAYLOAD(tb[TCA_CBQ_RATE-1]) < sizeof(struct tc_ratespec))
 		return -EINVAL;
--- net/sched/sch_csz.c.orig	2004-04-12 00:24:08.126743018 +0200
+++ net/sched/sch_csz.c	2004-04-12 00:36:16.195184499 +0200
@@ -763,6 +763,8 @@ static int csz_init(struct Qdisc *sch, s
 	struct tc_csz_qopt *qopt;
 	int    i;
 
+	if (!opt)
+		return -EINVAL;
 	rtattr_parse(tb, TCA_CSZ_PTAB, RTA_DATA(opt), RTA_PAYLOAD(opt));
 	if (tb[TCA_CSZ_PARMS-1] == NULL ||
 	    RTA_PAYLOAD(tb[TCA_CSZ_PARMS-1]) < sizeof(*qopt))