From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9C3EC7618B for ; Fri, 26 Jul 2019 15:39:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99020205F4 for ; Fri, 26 Jul 2019 15:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564155541; bh=GH0024jItE3M+mrjJFsl1zzLd5bi+P+GwkHqwepwIG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g/PZBMFSBBpeL2lQbxryeLGXgdv46DlVfqAHD0e/VT+ixh+6YaBhwXsGych5/+m/W FEHis37SWfEMAA5ihCapGTLWx+njtq8/Nwh5fcPegr78haOYfhPN4c1tYWdokbBOEe AyEWEUzFKKt5KUt/SmDkQJbwyH/QwydIfRkI1OlY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388781AbfGZPjA (ORCPT ); Fri, 26 Jul 2019 11:39:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:41190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388182AbfGZP1C (ORCPT ); Fri, 26 Jul 2019 11:27:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EBF6A22CBD; Fri, 26 Jul 2019 15:27:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154822; bh=GH0024jItE3M+mrjJFsl1zzLd5bi+P+GwkHqwepwIG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FrT0P757tt40iw3Z/r78Yd3FbiOfimvQSiWdR1Vh062JVJms7i9Vg4tWf7aaEgU6s XYvG6ozc3Aj59GwkthMWDw9I8JPcP/HRVC8hUFJGUATV0hlmoaKw4wbCFDwAC8XEM/ 3iH8BrKxjnN+TWJ3obgAfRukfyHLhld0ru5PFazo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Frank de Brabander , Willem de Bruijn , "David S. Miller" Subject: [PATCH 5.2 36/66] selftests: txring_overwrite: fix incorrect test of mmap() return value Date: Fri, 26 Jul 2019 17:24:35 +0200 Message-Id: <20190726152305.920273600@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190726152301.936055394@linuxfoundation.org> References: <20190726152301.936055394@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frank de Brabander [ Upstream commit cecaa76b2919aac2aa584ce476e9fcd5b084add5 ] If mmap() fails it returns MAP_FAILED, which is defined as ((void *) -1). The current if-statement incorrectly tests if *ring is NULL. Fixes: 358be656406d ("selftests/net: add txring_overwrite") Signed-off-by: Frank de Brabander Acked-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/txring_overwrite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/testing/selftests/net/txring_overwrite.c +++ b/tools/testing/selftests/net/txring_overwrite.c @@ -113,7 +113,7 @@ static int setup_tx(char **ring) *ring = mmap(0, req.tp_block_size * req.tp_block_nr, PROT_READ | PROT_WRITE, MAP_SHARED, fdt, 0); - if (!*ring) + if (*ring == MAP_FAILED) error(1, errno, "mmap"); return fdt;