From owner-svn-src-user@freebsd.org  Mon Feb 10 16:15:35 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A44E23D912
 for <svn-src-user@mailman.nyi.freebsd.org>;
 Mon, 10 Feb 2020 16:15:35 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48GWGb21c8z4f9q;
 Mon, 10 Feb 2020 16:15:35 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4007921B4D;
 Mon, 10 Feb 2020 16:15:35 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01AGFZgj022802;
 Mon, 10 Feb 2020 16:15:35 GMT (envelope-from uqs@FreeBSD.org)
Received: (from uqs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01AGFZna022801;
 Mon, 10 Feb 2020 16:15:35 GMT (envelope-from uqs@FreeBSD.org)
Message-Id: <202002101615.01AGFZna022801@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: uqs set sender to uqs@FreeBSD.org
 using -f
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Mon, 10 Feb 2020 16:15:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r357732 - user/uqs/coverity
X-SVN-Group: user
X-SVN-Commit-Author: uqs
X-SVN-Commit-Paths: user/uqs/coverity
X-SVN-Commit-Revision: 357732
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Feb 2020 16:15:35 -0000

Author: uqs
Date: Mon Feb 10 16:15:34 2020
New Revision: 357732
URL: https://svnweb.freebsd.org/changeset/base/357732

Log:
  ... and delete the model, because we currently no longer use it.
  
  Coverity apparently got smarter over time and will produce fewer false
  positives around kernel malloc when this model is *not* in use.

Modified:
  user/uqs/coverity/model.c

Modified: user/uqs/coverity/model.c
==============================================================================
--- user/uqs/coverity/model.c	Mon Feb 10 16:14:07 2020	(r357731)
+++ user/uqs/coverity/model.c	Mon Feb 10 16:15:34 2020	(r357732)
@@ -6,30 +6,5 @@
  * upload it via https://scan.coverity.com/projects/freebsd?tab=analysis_settings
  */
 
-/* From <sys/malloc.h>. */
-#define M_WAITOK 0x0002
 
-/*
- * If M_WAIT_OK is set, malloc() will always return something meaningful.
- */
-void *
-malloc(unsigned long size, struct malloc_type *mtp, int flags)
-{
-	int has_memory;
-
-	__coverity_negative_sink__(size);
-
-	if (flags & M_WAITOK || has_memory)
-		return __coverity_alloc__(size);
-
-	return 0;
-}
-
-/*
- * Don't complain about leaking FDs in unit tests.
- */
-static void
-leak(int fd)
-{
-	__coverity_close__(fd);
-}
+// Currently no special model is in use.