From patchwork Wed Nov 5 14:18:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stuart Haslam X-Patchwork-Id: 40190 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 407A8240A6 for ; Wed, 5 Nov 2014 14:19:41 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id x13sf546154wgg.5 for ; Wed, 05 Nov 2014 06:19:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=CvJFH4zJ2pLK7GGNp7EPZJF473EUgV+gCZ5rdFHCVOg=; b=cL+PCCapgur8TLbM6R3i7Sibdr7VIUC3546dqZBuTHvioaobA+acdZR7t0WHrPP+nj UBrPbc1oSjW4aHG7iNUuIHcSLxeiNq6FdPMa4TIgSrbN7ph8p6O0GKCT2aol36fvGrRv Xf4ZNp8rm4xuS7wH15JDjvdkISb0r2ES99Q0PdqKjRFoEm111XbiWtDZNkvd/c3JykTR ePOrPM/vpd7p7mUAj1M6cH/NdnNmgu4zH4SywtQj5Ilc/kAiTba0EPS7BFLSOn+0YwSw tjqWAcO7Pr6jqdHSdRYzsSENIS8KeXsJhGkh0n9MUlsBqtji4LmQNFJGhrfJHsTEzT5J Rs/Q== X-Gm-Message-State: ALoCoQmctw8CSuuwaM5oBT8UuIGRjwIU/Ahs6ZocR6daYDDwDUn7ESkV7Qgtsd58LtYi/DF/5QMj X-Received: by 10.152.6.4 with SMTP id w4mr424147law.7.1415197180465; Wed, 05 Nov 2014 06:19:40 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.39 with SMTP id b7ls896001lae.38.gmail; Wed, 05 Nov 2014 06:19:40 -0800 (PST) X-Received: by 10.112.25.73 with SMTP id a9mr69092445lbg.10.1415197180149; Wed, 05 Nov 2014 06:19:40 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id li1si6270350lab.112.2014.11.05.06.19.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 06:19:39 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so819357lbj.9 for ; Wed, 05 Nov 2014 06:19:39 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr67659199lbc.34.1415197179795; Wed, 05 Nov 2014 06:19:39 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp288150lbc; Wed, 5 Nov 2014 06:19:38 -0800 (PST) X-Received: by 10.140.21.36 with SMTP id 33mr56288146qgk.61.1415197178407; Wed, 05 Nov 2014 06:19:38 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id p39si6637841qgp.16.2014.11.05.06.19.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 06:19:38 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Xm1Qt-0003e6-GQ; Wed, 05 Nov 2014 14:19:35 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Xm1Qm-0003e1-21 for lng-odp@lists.linaro.org; Wed, 05 Nov 2014 14:19:28 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Wed, 05 Nov 2014 14:19:26 +0000 Received: from e106441.cambridge.arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 Nov 2014 14:19:20 +0000 From: Stuart Haslam To: lng-odp@lists.linaro.org Date: Wed, 5 Nov 2014 14:18:57 +0000 Message-Id: <1415197137-17342-1-git-send-email-stuart.haslam@arm.com> X-Mailer: git-send-email 2.1.1 X-OriginalArrivalTime: 05 Nov 2014 14:19:20.0734 (UTC) FILETIME=[7DC563E0:01CFF903] X-MC-Unique: 114110514192602401 X-Topics: patch Subject: [lng-odp] [PATCH] linux-generic: fix SEGV on deq from an empty pktin queue X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stuart.haslam@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Running the odp_ipsec application built with IPSEC_POLLED_QUEUES enabled triggers a crash (on linux-generic). pktin_dequeue can end up calling queue_enq_multi with the num parameter set to 0, num-1 is then used as an array index causing a SEGV. There's also a minor issue with pktin_deq_multi returning 0 buffers immediately after it had received some from the pktio, so fix both and refactor a bit at the same time. Signed-off-by: Stuart Haslam --- platform/linux-generic/odp_packet_io.c | 66 +++++++++++++++------------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index f35193f..560740f 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -413,34 +413,38 @@ int pktin_enqueue(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr) return queue_enq(qentry, buf_hdr); } +static inline int pktin_recv_multi(queue_entry_t *qentry, + odp_buffer_hdr_t *buf_hdr[], int num) +{ + odp_packet_t pkt_tbl[QUEUE_MULTI_MAX]; + odp_buffer_hdr_t *tmp_hdr_tbl[QUEUE_MULTI_MAX]; + odp_buffer_t buf; + int pkts, i, j, nbr = 0; + + pkts = odp_pktio_recv(qentry->s.pktin, pkt_tbl, QUEUE_MULTI_MAX); + if (pkts > 0) { + for (i = 0, j = 0; i < pkts; ++i) { + buf = odp_packet_to_buffer(pkt_tbl[i]); + if (i < num) + buf_hdr[nbr++] = odp_buf_to_hdr(buf); + else + tmp_hdr_tbl[j++] = odp_buf_to_hdr(buf); + } + if (j > 0) + queue_enq_multi(qentry, tmp_hdr_tbl, j); + } + + return nbr; +} + odp_buffer_hdr_t *pktin_dequeue(queue_entry_t *qentry) { odp_buffer_hdr_t *buf_hdr; buf_hdr = queue_deq(qentry); - if (buf_hdr == NULL) { - odp_packet_t pkt; - odp_buffer_t buf; - odp_packet_t pkt_tbl[QUEUE_MULTI_MAX]; - odp_buffer_hdr_t *tmp_hdr_tbl[QUEUE_MULTI_MAX]; - int pkts, i, j; - - pkts = odp_pktio_recv(qentry->s.pktin, pkt_tbl, - QUEUE_MULTI_MAX); - - if (pkts > 0) { - pkt = pkt_tbl[0]; - buf = odp_packet_to_buffer(pkt); - buf_hdr = odp_buf_to_hdr(buf); - - for (i = 1, j = 0; i < pkts; ++i) { - buf = odp_packet_to_buffer(pkt_tbl[i]); - tmp_hdr_tbl[j++] = odp_buf_to_hdr(buf); - } - queue_enq_multi(qentry, tmp_hdr_tbl, j); - } - } + if (buf_hdr == NULL) + pktin_recv_multi(qentry, &buf_hdr, 1); return buf_hdr; } @@ -457,22 +461,8 @@ int pktin_deq_multi(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr[], int num) nbr = queue_deq_multi(qentry, buf_hdr, num); - if (nbr < num) { - odp_packet_t pkt_tbl[QUEUE_MULTI_MAX]; - odp_buffer_hdr_t *tmp_hdr_tbl[QUEUE_MULTI_MAX]; - odp_buffer_t buf; - int pkts, i; - - pkts = odp_pktio_recv(qentry->s.pktin, pkt_tbl, - QUEUE_MULTI_MAX); - if (pkts > 0) { - for (i = 0; i < pkts; ++i) { - buf = odp_packet_to_buffer(pkt_tbl[i]); - tmp_hdr_tbl[i] = odp_buf_to_hdr(buf); - } - queue_enq_multi(qentry, tmp_hdr_tbl, pkts); - } - } + if (nbr < num) + nbr += pktin_recv_multi(qentry, &buf_hdr[nbr], num-nbr); return nbr; }