From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 25E024B9E8 for ; Mon, 8 Jul 2024 17:46:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5325268DC8A; Mon, 8 Jul 2024 20:46:27 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 95B0668DC55 for ; Mon, 8 Jul 2024 20:46:21 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 39909EA9C5 for ; Mon, 8 Jul 2024 19:46:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LS7yviqdgtRq for ; Mon, 8 Jul 2024 19:46:19 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 4C8D1EA9B7 for ; Mon, 8 Jul 2024 19:46:19 +0200 (CEST) Date: Mon, 8 Jul 2024 19:46:19 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20240608231046.3619551-8-michael@niedermayer.cc> Message-ID: <671f8e46-5eff-335e-d298-cc462543344f@passwd.hu> References: <20240608231046.3619551-1-michael@niedermayer.cc> <20240608231046.3619551-8-michael@niedermayer.cc> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 8/9] avformat/udp: Fix temporary buffer race X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, 9 Jun 2024, Michael Niedermayer wrote: > Fixes: CID1551679 Data race condition > Fixes: CID1551687 Data race condition How is this a data race? Concurrent reading and writing is not supported for UDP as far as I know. Thanks, Marton > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer > --- > libavformat/udp.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/libavformat/udp.c b/libavformat/udp.c > index c1ebdd12220..fd4847eda71 100644 > --- a/libavformat/udp.c > +++ b/libavformat/udp.c > @@ -107,7 +107,8 @@ typedef struct UDPContext { > pthread_cond_t cond; > int thread_started; > #endif > - uint8_t tmp[UDP_MAX_PKT_SIZE+4]; > + uint8_t tmp_rx[UDP_MAX_PKT_SIZE+4]; > + uint8_t tmp_tx[UDP_MAX_PKT_SIZE+4]; > int remaining_in_dg; > char *localaddr; > int timeout; > @@ -504,7 +505,7 @@ static void *circular_buffer_task_rx( void *_URLContext) > see "General Information" / "Thread Cancelation Overview" > in Single Unix. */ > pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelstate); > - len = recvfrom(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0, (struct sockaddr *)&addr, &addr_len); > + len = recvfrom(s->udp_fd, s->tmp_rx+4, sizeof(s->tmp_rx)-4, 0, (struct sockaddr *)&addr, &addr_len); > pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); > pthread_mutex_lock(&s->mutex); > if (len < 0) { > @@ -516,7 +517,7 @@ static void *circular_buffer_task_rx( void *_URLContext) > } > if (ff_ip_check_source_lists(&addr, &s->filters)) > continue; > - AV_WL32(s->tmp, len); > + AV_WL32(s->tmp_rx, len); > > if (av_fifo_can_write(s->fifo) < len + 4) { > /* No Space left */ > @@ -532,7 +533,7 @@ static void *circular_buffer_task_rx( void *_URLContext) > goto end; > } > } > - av_fifo_write(s->fifo, s->tmp, len + 4); > + av_fifo_write(s->fifo, s->tmp_rx, len + 4); > pthread_cond_signal(&s->cond); > } > > @@ -581,9 +582,9 @@ static void *circular_buffer_task_tx( void *_URLContext) > len = AV_RL32(tmp); > > av_assert0(len >= 0); > - av_assert0(len <= sizeof(s->tmp)); > + av_assert0(len <= sizeof(s->tmp_tx)); > > - av_fifo_read(s->fifo, s->tmp, len); > + av_fifo_read(s->fifo, s->tmp_tx, len); > > pthread_mutex_unlock(&s->mutex); > > @@ -607,7 +608,7 @@ static void *circular_buffer_task_tx( void *_URLContext) > target_timestamp = start_timestamp + sent_bits * 1000000 / s->bitrate; > } > > - p = s->tmp; > + p = s->tmp_tx; > while (len) { > int ret; > av_assert0(len > 0); > -- > 2.45.2 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".