From patchwork Wed Mar 10 21:54:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26331 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C3EDF44B799 for ; Wed, 10 Mar 2021 23:55:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE9BF68ABD9; Wed, 10 Mar 2021 23:55:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C33E68AB82 for ; Wed, 10 Mar 2021 23:55:41 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id e19so41902773ejt.3 for ; Wed, 10 Mar 2021 13:55:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=e82P049+YimJN626QPZroM0UXovvETCUM4vHdo3pqAE=; b=f48K5xLtmMyMk2gM0YeVMU5e7YP6NRhNL4/cCSjJRVkeNgD7hDXMmDvPqx3Gy42Oym 09m9Sk+ajBpHnzhYFauzW4JEhbO+JmMNgnfcPwlrB+KP4qPPDKgbK5X8RZCU5hqT7My8 8UPBsPx9oy9rMp6egrRvaH4VEpCCr1qirnT4jTmt0n9Cz+Gy0nkCToIuFeVlSPT+ScWq ihjImEIqWdmpM2L3Xxz9tFOdnhMTZ2DZjwvse1AliwOwATwy6qGU/vovOI3scwwDVyZr usZImV8MSKZhPp21k7oFmth7HnhSi3WZUzOpWi86OIySNzlkEpNDDAjS6ikBz1e4txmu 8pqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=e82P049+YimJN626QPZroM0UXovvETCUM4vHdo3pqAE=; b=tLPd62HIyHWTI7BPcn4gtkL0RY3xV7YVJVpq8W+vFhQdYOWX1erA32syaaZO+VUe1i FkfpR/gxHFSyWhXRfd6gs2sCWUv5vnF++Ak4IJrHAZnsP4IV+i+hw0Ahk6/GPrP7d/iF SnbFSmhELGj1ZY/UTnI8tvzxAu4gbwYifiARGPySHDuGVfzpeUISdPylkyocokl6JWYM KmRFqthS0cIxoP5aavQ7BGH/VD3AddOMgjk3j4D8w7JWGKIkvXv2rbX9i59pRTKnLGSq CmYs0UdK3wz1J/oyaejLORFJrLPG7KTCK8dmC2drIaC5clJNwOaEbxKdpxrpBSG8nwnj Ww6g== X-Gm-Message-State: AOAM533XCWtPBZWQ8YKeD0BrozQwFFHc6jUDRb8CNefiLbohjfIk0KP4 b96F+rHfXaTwqCVCqmdkVFJDGqN8gp0= X-Google-Smtp-Source: ABdhPJyV4cv8cpz9JyN58wEPPRZknalszJbyGmNtzi0tFyM0PLUuzDfVDQh5Qt/m0aQ5iZsu0YTp9Q== X-Received: by 2002:a17:907:77d4:: with SMTP id kz20mr15053ejc.93.1615413340829; Wed, 10 Mar 2021 13:55:40 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id m10sm351993ejx.10.2021.03.10.13.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:55:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Mar 2021 22:54:43 +0100 Message-Id: <20210310215446.1396386-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> References: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/23] dnn/dnn_backend_native_layer_conv2d: Check thread creation for errors X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes Coverity issue #1473533. Signed-off-by: Andreas Rheinhardt --- libavfilter/dnn/dnn_backend_native_layer_conv2d.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c index 941330c895..44e5bdb5f7 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c +++ b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c @@ -190,7 +190,7 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera #if HAVE_PTHREAD_CANCEL int thread_num = (ctx->options.conv2d_threads <= 0 || ctx->options.conv2d_threads > av_cpu_count()) ? (av_cpu_count() + 1) : (ctx->options.conv2d_threads); - int thread_stride; + int ret = DNN_SUCCESS, thread_stride; ThreadParam *thread_param; #else ThreadParam thread_param = { 0 }; @@ -236,7 +236,12 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera thread_param[i].thread_common_param = &thread_common_param; thread_param[i].thread_start = thread_stride * i + pad_size; thread_param[i].thread_end = (i == thread_num - 1) ? (height - pad_size) : (thread_param[i].thread_start + thread_stride); - pthread_create(&thread_param[i].thread, NULL, dnn_execute_layer_conv2d_thread, &thread_param[i]); + if (pthread_create(&thread_param[i].thread, NULL, + dnn_execute_layer_conv2d_thread, &thread_param[i])) { + thread_num = i; + ret = DNN_ERROR; + break; + } } //join threads, res gets function return @@ -246,12 +251,14 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera //release memory av_free(thread_param); + + return ret; #else thread_param.thread_common_param = &thread_common_param; thread_param.thread_start = pad_size; thread_param.thread_end = height - pad_size; dnn_execute_layer_conv2d_thread(&thread_param); -#endif return DNN_SUCCESS; +#endif }