From patchwork Wed Jan 7 15:54:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ciprian Barbu X-Patchwork-Id: 42833 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 28C4D2055F for ; Wed, 7 Jan 2015 15:55:07 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id z12sf824312lbi.2 for ; Wed, 07 Jan 2015 07:55:06 -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:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=HmxxVumoKs2IgfYUrodhO5avlcHN71lxrEr6OY5s9z4=; b=Ex2eGamaAWQhTx6jfMnI6VYSYetVpEkoCzkRUpxAyj87jsJ/igFNcWt3+Q85VgDG1t zEoNF1eMU1WsT+c9MBktSQkG4jEb55Ne2GK/UYAaPlrk1quJaxes7Ix1GCggSZ7aVl1u zeWJpaZ6tRaFIpl8+KhmgsiI6RjF6gpJMlWb/CJ9x+B2DgesDhMSvEIjHX6sfYCkTAAh vkyRT44lVZSx5doNeGN7EZkYCibU1OOl5P8WQZr8yYpLGD42oJRaR+F8jI40uKY7r4sH D607wqQ0TbwaxDqes993P5rNaxaVtTiOxzvL85WTIwzwjFS/Dp+/CKSmGNaSJ85Ba2NS Ko6A== X-Gm-Message-State: ALoCoQmcNKbmMTcSIUf4d6gjugLsuZFbejrWwqsEDdcwiP0lyVqiuk9FotZjydTvTNSI/Cn7qCQI X-Received: by 10.180.228.38 with SMTP id sf6mr3067747wic.5.1420646106028; Wed, 07 Jan 2015 07:55:06 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.33 with SMTP id lt1ls184156lac.64.gmail; Wed, 07 Jan 2015 07:55:05 -0800 (PST) X-Received: by 10.152.19.7 with SMTP id a7mr5795305lae.16.1420646105868; Wed, 07 Jan 2015 07:55:05 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id ap1si3553571lac.117.2015.01.07.07.55.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Jan 2015 07:55:05 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id pv20so4198184lab.13 for ; Wed, 07 Jan 2015 07:55:05 -0800 (PST) X-Received: by 10.152.6.132 with SMTP id b4mr5827363laa.59.1420646105572; Wed, 07 Jan 2015 07:55:05 -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.9.200 with SMTP id c8csp1523933lbb; Wed, 7 Jan 2015 07:55:04 -0800 (PST) X-Received: by 10.224.54.2 with SMTP id o2mr5706900qag.63.1420646104043; Wed, 07 Jan 2015 07:55:04 -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 c4si2343435qaa.78.2015.01.07.07.55.01 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 07 Jan 2015 07:55:04 -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 1Y8swl-0008BY-Rp; Wed, 07 Jan 2015 15:54:59 +0000 Received: from mail-qc0-f178.google.com ([209.85.216.178]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y8swg-0008BT-Jq for lng-odp@lists.linaro.org; Wed, 07 Jan 2015 15:54:54 +0000 Received: by mail-qc0-f178.google.com with SMTP id p6so1101846qcv.9 for ; Wed, 07 Jan 2015 07:54:49 -0800 (PST) X-Received: by 10.140.16.50 with SMTP id 47mr5464455qga.105.1420646089401; Wed, 07 Jan 2015 07:54:49 -0800 (PST) Received: from cipriantemp.enea.se (sestofw01.enea.se. [192.36.1.252]) by mx.google.com with ESMTPSA id k102sm1628680qgd.7.2015.01.07.07.54.47 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Jan 2015 07:54:48 -0800 (PST) From: Ciprian Barbu To: lng-odp@lists.linaro.org Date: Wed, 7 Jan 2015 17:54:38 +0200 Message-Id: <1420646078-25851-1-git-send-email-ciprian.barbu@linaro.org> X-Mailer: git-send-email 1.8.3.2 X-Topics: patch Subject: [lng-odp] [PATCH] linux-generic: pktio: fix crash caused by invalid l2 offset 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: ciprian.barbu@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 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 Signed-off-by: Ciprian Barbu --- Fix for bug 1034: https://bugs.linaro.org/show_bug.cgi?id=1034 platform/linux-generic/odp_packet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index eb0767a..180c8e0 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -232,6 +232,8 @@ void odp_packet_user_u64_set(odp_packet_t pkt, uint64_t ctx) void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + if (pkt_hdr == NULL) + return NULL; return packet_map(pkt_hdr, pkt_hdr->l2_offset, len); } @@ -778,7 +780,7 @@ int _odp_packet_parse(odp_packet_t pkt) pkt_hdr->error_flags.all = 0; pkt_hdr->input_flags.all = 0; pkt_hdr->output_flags.all = 0; - pkt_hdr->l2_offset = ODP_PACKET_OFFSET_INVALID; + pkt_hdr->l2_offset = 0; pkt_hdr->l3_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->l4_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->payload_offset = ODP_PACKET_OFFSET_INVALID;