From patchwork Thu Jun 25 09:03:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 488319 X-Patchwork-Delegate: shemminger@vyatta.com 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 8D9111402DE for ; Thu, 25 Jun 2015 19:03:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=mdAnu08Z; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752376AbbFYJDU (ORCPT ); Thu, 25 Jun 2015 05:03:20 -0400 Received: from mail-ie0-f171.google.com ([209.85.223.171]:36592 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752334AbbFYJDQ (ORCPT ); Thu, 25 Jun 2015 05:03:16 -0400 Received: by iecvh10 with SMTP id vh10so50337386iec.3 for ; Thu, 25 Jun 2015 02:03:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ov2595HOfeffqJLOcGcS9gD+CJMFntv0vxZmzngNu1U=; b=mdAnu08ZT/txKwmFQLQDiP3/cuhoc21bhvyhmQkyrcwwauBv+r8/Jg+l4hFYSOhd+6 OFxDbTBjYBacVVlOtrTvEW/YJ+b6v7AcBZd62pGX9AQUj3yhoxv17wPRdlrVt5U3dp5X cvoyP8im/EP5Wa/8/Hid6n0yvipJz+excnjzMiQto5vE8L+HgGHwXWbhvJXj+PkW9qHW zn3NnmKcQRzVd2xv3jtQRyNwhsaq1U7pXPYtvj9m+USLpykpWeRfI+FPgTiuoppNTyEr tyQoTI03xRhtxjw/C52GSpd5JKJB+iYI+Y2H4t7cCB3M+nELMRYocmMG83SWPVWhX65L 3tpA== X-Received: by 10.107.9.88 with SMTP id j85mr21429954ioi.37.1435222995857; Thu, 25 Jun 2015 02:03:15 -0700 (PDT) Received: from vpbr9.mtv.corp.google.com ([172.24.110.201]) by mx.google.com with ESMTPSA id b73sm19211225iob.25.2015.06.25.02.03.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jun 2015 02:03:14 -0700 (PDT) From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= To: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Stephen Hemminger , Eric Dumazet Cc: netdev@vger.kernel.org Subject: [PATCH 2/2] iproute2: misc/ss.c - fix run_ssfilter af_packet when protocol == 0 Date: Thu, 25 Jun 2015 02:03:03 -0700 Message-Id: <1435222983-14661-2-git-send-email-zenczykowski@gmail.com> X-Mailer: git-send-email 2.4.3.573.g4eafbef In-Reply-To: <1435222983-14661-1-git-send-email-zenczykowski@gmail.com> References: <1435222983-14661-1-git-send-email-zenczykowski@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Żenczykowski s->local.data is a pointer to a field of a non-NULL struct, and hence cannot be NULL, thus comparing it to 0 is always false, and thus the return is always false. Presumably this was meant to be a check whether s->local.data[0] (which I believe stores af_packet protocol) is 0, ie. ANY. Change-Id: Ia232f5b06ce081e3b2fb6338f1a709cd94e03ae5 Fixes: ss.c:1018:37: error: comparison of array 's->local.data' equal to a null pointer is always false [-Werror,-Wtautological-pointer-compare] return s->lport == 0 && s->local.data == 0; ~~~~~~~~~^~~~ ~ 1 error generated. --- misc/ss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/ss.c b/misc/ss.c index dba0901791c7..36b0efdfd32f 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1090,7 +1090,7 @@ static int run_ssfilter(struct ssfilter *f, struct sockstat *s) strspn(p+1, "0123456789abcdef") == 5); } if (s->local.family == AF_PACKET) - return s->lport == 0 && s->local.data == 0; + return s->lport == 0 && s->local.data[0] == 0; if (s->local.family == AF_NETLINK) return s->lport < 0;