From patchwork Tue Mar 3 22:23:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 24017 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id B022BDDF4E for ; Wed, 4 Mar 2009 09:24:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763191AbZCCWXl (ORCPT ); Tue, 3 Mar 2009 17:23:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762536AbZCCWXk (ORCPT ); Tue, 3 Mar 2009 17:23:40 -0500 Received: from mail-ew0-f177.google.com ([209.85.219.177]:47715 "EHLO mail-ew0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758401AbZCCWXj (ORCPT ); Tue, 3 Mar 2009 17:23:39 -0500 Received: by ewy25 with SMTP id 25so2534157ewy.37 for ; Tue, 03 Mar 2009 14:23:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=jm2+sqZ4nrwkiYqJlWpck1ZJ3V8puZ4xPWdUVn2DeDM=; b=iYYmd7a3cfYZKZkjrKilwbgen2raHpjh956Un/8Qpugn0yLyPl0G/OJj8zWgLOwHNr rzqw4649ChN9g0h97A0C9ZSb74/ZtSM1OyM1ZdTmGx/DdCK5BmHPYqXM70e7u7JSvee3 xM1lgXqbFSu0/x7pmlQpb2FQyERJmBPaeXliY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=UKkZNDni6SF/0NXqLBek4NwY09VdEwFcDhJQVLMk8v4xiU5+3k84hcozUjJMRlfYxT 2ocfGHa4/jIL7QOmDAdv6WqJHUVqfsbqCRelAgWul12qVyH9W3xh1PWSxZJqjK/ae3Lu XqUmMH6Qrq1kkbKz1vUeIv1Spy/CZizGS5XCI= Received: by 10.216.11.213 with SMTP id 63mr460866wex.176.1236119015545; Tue, 03 Mar 2009 14:23:35 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id f4sm2245008nfh.6.2009.03.03.14.23.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 03 Mar 2009 14:23:35 -0800 (PST) Message-ID: <49ADADEA.8090306@gmail.com> Date: Tue, 03 Mar 2009 23:23:38 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: paul.moore@hp.com CC: netdev@vger.kernel.org, "David S. Miller" , Andrew Morton Subject: [PATCH] cipso: subtraction on unsigned hdr_delta Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org hdr_delta is unsigned, so take care not to subtract below 0. Signed-off-by: Roel Kluin --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 7bc9929..b1d862b 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -1999,7 +1999,11 @@ void cipso_v4_sock_delattr(struct sock *sk) iter++; hdr_delta = opt->optlen; opt->optlen = (optlen_new + 3) & ~3; - hdr_delta -= opt->optlen; + + if (hdr_delta > opt->optlen) + hdr_delta -= opt->optlen; + else + hdr_delta = 0; } else { /* only the cipso option was present on the socket so we can * remove the entire option struct */