From patchwork Wed Oct 14 00:59:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22934 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 1EE2B44B4AA for ; Wed, 14 Oct 2020 04:06:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3A8868B966; Wed, 14 Oct 2020 04:06:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79D4568B94F for ; Wed, 14 Oct 2020 04:06:17 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id y14so866325pgf.12 for ; Tue, 13 Oct 2020 18:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miceli-net-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ziMfjHBvJ/OnTbrsXx8CQWIwwC6+HoOUTDr2f1zPRiM=; b=l7AWAmVNoFSRI0DSIQ89nDR6whVFK2dUuMpWIRQ63Z7AiAoQIhINj1dcCeE3cWNm9C 8a/Bb3wmBx3GCJQjbwN/LqrdIhlhgYsF+6wF+g8EskG+fGb9Qw6bj48daW0XranIRUgw IdLucRFU4dztIBS0dyP0dPz+b5wMZV1/A6FZxiwNDtTGQ3w88Tsek+L4CDvhazpwAURf 5DBMFpblo1gaWsfT4dS5qvUDtD7of+Z1bOXL3oNZr1G8jN4Xh3Ou0tUor0elEBABILhW h1jAIKVwCTlcQXG6IzwKaJ6ctpn6cLuCNsjpNgdBpKYTfh1lsJBizoM/t09CT4HKKv90 a2rw== 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:mime-version :content-transfer-encoding; bh=ziMfjHBvJ/OnTbrsXx8CQWIwwC6+HoOUTDr2f1zPRiM=; b=IXgi/GhLBMjc5yTTCPJ2zY1UZjCZtzW/0x3aBPT8V3cO49Ormsuo0TIBiMTxvsuGLv xZdsbyd6NiQA/WTKniMqEjuv84AJ8xl3NOLuuS7uXe88JAjGk+OT7w4eNcDMbzi2SY/S 6rgl6PEJbAqJWqcs07J31UUf2PJpkdcj9qydrYDh9Dqp1tM1bFoI8hWBIYQpvBtICL8/ C5I/pbXjS1UAiAXULoQQ/E/6hYph7PjpEZnjQPRdT3lBA6qjAnz0DFHPIblpx+9z83lM zvZqFd1ADQTZgWEE4Tj4GeEAyTX9+AgBcUzpCPFyx8snle47gzlLNLLRnJ8cuJIiloTO CMnA== X-Gm-Message-State: AOAM531PAuQIPILmD2I7UgHrQCr45RyE3siI2tXbbYRkBPOeIEbMvCft Nt/OSrb6VHNXmf8GrPOVBITIP7A95h0Gv4F/ X-Google-Smtp-Source: ABdhPJxymiHqE9vnMvFAaN4eEaa184KuUrIiZq25RIO5wED5WtJBVI5Pncvz9Rqg4H0LRdmqbpA50Q== X-Received: by 2002:a17:902:d20a:b029:d4:c79c:b156 with SMTP id t10-20020a170902d20ab02900d4c79cb156mr2012595ply.46.1602637209642; Tue, 13 Oct 2020 18:00:09 -0700 (PDT) Received: from edna.localdomain (119-18-3-107.771203.syd.nbn.aussiebb.net. [119.18.3.107]) by smtp.gmail.com with ESMTPSA id ha24sm507325pjb.27.2020.10.13.18.00.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 18:00:08 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Oct 2020 11:59:44 +1100 Message-Id: <20201014005944.329777-1-chris@miceli.net.au> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavfilter/dnn/dnn_backend{openvino, tf}: check memory alloc non-NULL 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: Chris Miceli Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These previously would not check that the return value was non-null meaning it was susceptible to a sigsegv. This checks those values. --- libavfilter/dnn/dnn_backend_openvino.c | 14 +++++++++++++- libavfilter/dnn/dnn_backend_tf.c | 16 +++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 495225d0b3..d510e162c6 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -141,8 +141,20 @@ static DNNReturnType get_output_ov(void *model, const char *input_name, int inpu { DNNReturnType ret; OVModel *ov_model = (OVModel *)model; + OVContext *ctx = &ov_model->ctx; AVFrame *in_frame = av_frame_alloc(); - AVFrame *out_frame = av_frame_alloc(); + AVFrame *out_frame = NULL; + + if (!in_frame) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for input frame\n"); + return DNN_ERROR; + } + out_frame = av_frame_alloc(); + if (!out_frame) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for output frame\n"); + av_frame_free(&in_frame); + return DNN_ERROR; + } in_frame->width = input_width; in_frame->height = input_height; diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index be860b11b5..7923e1db69 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -159,8 +159,22 @@ static DNNReturnType get_output_tf(void *model, const char *input_name, int inpu { DNNReturnType ret; TFModel *tf_model = (TFModel *)model; + TFContext *ctx = &tf_model->ctx; AVFrame *in_frame = av_frame_alloc(); - AVFrame *out_frame = av_frame_alloc(); + AVFrame *out_frame = NULL; + + if (!in_frame) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for input frame\n"); + return DNN_ERROR; + } + + out_frame = av_frame_alloc(); + if (!out_frame) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for output frame\n"); + av_frame_free(&in_frame); + return DNN_ERROR; + } + in_frame->width = input_width; in_frame->height = input_height;