From patchwork Sat Aug 14 21:09:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 61738 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 75D1FB6EF3 for ; Sun, 15 Aug 2010 07:10:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755814Ab0HNVKd (ORCPT ); Sat, 14 Aug 2010 17:10:33 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:36801 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755614Ab0HNVKc (ORCPT ); Sat, 14 Aug 2010 17:10:32 -0400 Received: by fxm13 with SMTP id 13so2375472fxm.19 for ; Sat, 14 Aug 2010 14:10:30 -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=7E4lylA9mXr8YP6EuN472zmmJvU9IraTzyYYHe5yfE8=; b=hnozlEzbNnPbJ8vnNmwCT6mfmZ2UtXAUQnrRiP2M8PlOVFXwdinUsfQSpcS9wUpSrN 2awOwiaHeYdOVzdITAoBjMN2gYdTI/viWzB/+DbmAi4RxIDt9Lnyn5EWXT3MUASs+VaA WCSgk5kbVn0cJd5PYbcfi+1i/L3NmC1Kp7Pas= 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=CFK24lX+Mb4iQBrGQCn7qIb+iFApzYbQr83RZtzKkn6fFZL/tLnOlYfJ8xCXy6hWJy 4UuQLbKgSoayNwXRU1bWGl7hnS+g0zAIHMM+fv1jGQ0UfX3bjvEt8Ga1P/Pi+7lftr0K rWzVkpOZjV0cOc1WYJJTdvkjhDX/5631+v7rI= Received: by 10.223.105.76 with SMTP id s12mr3486229fao.107.1281820230858; Sat, 14 Aug 2010 14:10:30 -0700 (PDT) Received: from bicker ([205.177.176.136]) by mx.google.com with ESMTPS id q17sm1708228faa.21.2010.08.14.14.10.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 14 Aug 2010 14:10:30 -0700 (PDT) Date: Sat, 14 Aug 2010 23:09:49 +0200 From: Dan Carpenter To: Jamal Hadi Salim Cc: "David S. Miller" , Patrick McHardy , Jarek Poplawski , Eric Dumazet , Stephen Hemminger , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] net/sched: remove unneeded NULL check Message-ID: <20100814210949.GB645@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no need to check "s". nla_data() doesn't return NULL. Also we already dereferenced "s" at this point so it would have oopsed ealier if it were NULL. Signed-off-by: Dan Carpenter --- 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 408eea7..6fb3d41 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -360,7 +360,7 @@ static struct qdisc_size_table *qdisc_get_stab(struct nlattr *opt) tsize = nla_len(tb[TCA_STAB_DATA]) / sizeof(u16); } - if (!s || tsize != s->tsize || (!tab && tsize > 0)) + if (tsize != s->tsize || (!tab && tsize > 0)) return ERR_PTR(-EINVAL); spin_lock(&qdisc_stab_lock);