Message ID | 20150929155809.baf59539515985a1025eb1f4@ubnt.com |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <openwrt-devel-bounces@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 53AAD140157 for <incoming@patchwork.ozlabs.org>; Tue, 29 Sep 2015 23:05:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ubnt.com header.i=@ubnt.com header.b=wR2P0GVq; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 21D2228C79C; Tue, 29 Sep 2015 15:04:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 7A54628C793 for <openwrt-devel@lists.openwrt.org>; Tue, 29 Sep 2015 15:04:10 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .ubnt. - helo: .mail-la0-f43.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by arrakis.dune.hu (Postfix) with ESMTPS for <openwrt-devel@lists.openwrt.org>; Tue, 29 Sep 2015 15:04:09 +0200 (CEST) Received: by laclj5 with SMTP id lj5so7542857lac.3 for <openwrt-devel@lists.openwrt.org>; Tue, 29 Sep 2015 06:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ubnt.com; s=google; h=date:from:to:subject:message-id:mime-version:content-type :content-transfer-encoding; bh=9JCb/Pr+XemRfGPkEs3wBP1/1Zo1nHgAF1zfFFjM8ME=; b=wR2P0GVqZTmtrTF3BmC0pd/1ZGk1hQKaNCUdUVaTZNProY+J28eSSpiidSWowAd2nT dt0F0Qp4Pmcv+f5M4Gb8AmluttlshCI+Y//dngITLjbYFiSNeu4+MGE2i3VLdxOnxpbe hXffOi/HlZU9jxlfE3RTLbX45G8Gh689+noqc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-type:content-transfer-encoding; bh=9JCb/Pr+XemRfGPkEs3wBP1/1Zo1nHgAF1zfFFjM8ME=; b=RHLdtD+qfuRreYRgXpOzG192l4KcDdSWK5LEX/M4D/mCmrkm4UFVy44m5ZmtSkErmw fSKJ+OqKUhQnkU/iYVYRjDmQjMkbweMQmYXzuoPBVyBN1nj5yXqTvii5xS9wnbpOn7iU R9ecJ366yVpVeW4z8sVtQNqd57EBP2o9/55rFxP5RXub5TMLIQj5/rLOlbYsAt4UnbYF 9gQGt2oBDNuQVnvlTYTCP8UDWpT+4iDIzhf2/6dvkCRS2gGs6SWCPHhuoJ/Zmwcts2UU yWgc3QXWe5Nsz3Su+CnH/M7OncHae5NkqLSnkxeFQ/rDrSs9Y2DJ+keyf1aTA5XCUpxI z7bw== X-Gm-Message-State: ALoCoQmZxgB+/47CgL3yWX2SVo2l4oJjY+uPvp9fOwqhxojK24JTd4yQPSxxUqhYZlHtfjl6gpQqk+MWGCDUfV5hD4jJ/R9V6AUU4oeN7DD+xV930kprbn56dIHA/JsnqX9VPzms2PWz1Q7dFQRY0NjWf02HCDwMG2sz8aNWfQmBnDacsTeioUkIlDCY9uky8Ko4sTqndLcn X-Received: by 10.152.43.164 with SMTP id x4mr7344802lal.57.1443531490413; Tue, 29 Sep 2015 05:58:10 -0700 (PDT) Received: from di ([80.233.186.214]) by smtp.gmail.com with ESMTPSA id h6sm2716887laf.15.2015.09.29.05.58.09 for <openwrt-devel@lists.openwrt.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 05:58:09 -0700 (PDT) Date: Tue, 29 Sep 2015 15:58:09 +0300 From: Dmitry Ivanov <dmitrijs.ivanovs@ubnt.com> To: openwrt-devel@lists.openwrt.org Message-Id: <20150929155809.baf59539515985a1025eb1f4@ubnt.com> X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) Mime-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH][odhcpd] Limit size of IPv4 DHCP reply X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/cgi-bin/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> |
diff --git a/src/dhcpv4.c b/src/dhcpv4.c index a657e13..c8014ea 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -497,7 +497,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, inet_ntoa(dest.sin_addr)); } - sendto(sock, &reply, sizeof(reply), MSG_DONTWAIT, + sendto(sock, &reply, cookie - (uint8_t*) &reply - 1, MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest)); }
Limit size of IPv4 DHCP reply. In other words, remove zero padding after end option (0xff). Signed-off-by: Dmitry Ivanov <dima@ubnt.com> --- src/dhcpv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)