From patchwork Tue Mar 28 14:00:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 744291 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vssy32clsz9s7N for ; Wed, 29 Mar 2017 01:01:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="E/qVlNeV"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbdC1OBL (ORCPT ); Tue, 28 Mar 2017 10:01:11 -0400 Received: from mail-wr0-f176.google.com ([209.85.128.176]:34723 "EHLO mail-wr0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbdC1OBJ (ORCPT ); Tue, 28 Mar 2017 10:01:09 -0400 Received: by mail-wr0-f176.google.com with SMTP id l43so106458047wre.1 for ; Tue, 28 Mar 2017 07:01:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=l+RGCwTWCE58ktfNckiIKsb+z+EN2xJFljNL/61iFCE=; b=E/qVlNeVnGW+Jh06z/yY1LLCGksygjqp0GNfaRMDZhaBQfqZFm8NfVWG9N4884mlH4 ETBXVJibOdFsDu0fpBHmxWaVMx6XitGc5l5nzIEgGtkzEyxTtIjmSavyuLQt6VenIfnd 1PwhgM/e+posMhUgbCq8uSEHSaGXkOm5k+vaNayu/uzMi3SpbbvC+C3Gje1h75ii5bPK En/piOVXL4IwmMLHUfk3ImZxB3p+GyKx7yJJ+cc6r8Mf3ZHnJU8KXWO4q7R+rNWXD7Ni q30BpFUTgXBXmnKT778lrbdL55Xd63Wj3bcq1mN4AE5ucJVSF+pEISBd5mlJLWwMgAjz UBKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=l+RGCwTWCE58ktfNckiIKsb+z+EN2xJFljNL/61iFCE=; b=HBgye7p5FvtZlDXbsJy7BtG7rM8Gi6Ib9egK2VdE0gjkJiEMQ7nnEZx7TcjMDWq2TU I/utGTUhh5chYAx0krcY4VxIvilSmRk0C2oetbFayOmcRdMOfEbrwn6G8WNNm4zFkUY2 2DlCJ1EoqfRaAy06hsrscobBWnWEC6lz4nOjqwqLTkALJsbWdbonjKDwBPahn8f7kZBv 2jxKBnDLAu5Ya2eabRHMI8HXg0YjXjSC1O60WdnF/4JZzU0R5Nk1Pzpn0tL8BxcH2+Q6 Qen9EdIY84VlWF3cHt7qeQGV7GR/mGkVj1s6Ig7xrtSW3hDqr0LiPh0RPrH/fP0rSCQ6 Ioqw== X-Gm-Message-State: AFeK/H0DbQRe8RH3nQjfLMLklE40WlIyGEykMhowNHvcEiAOlZdawtN4oPK9fZZMjRb6U/1C X-Received: by 10.223.174.164 with SMTP id y33mr25780161wrc.166.1490709660994; Tue, 28 Mar 2017 07:01:00 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([100.105.12.17]) by smtp.gmail.com with ESMTPSA id j77sm3768916wmj.3.2017.03.28.07.00.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2017 07:00:59 -0700 (PDT) Received: by andreyknvl0.muc.corp.google.com (Postfix, from userid 206546) id 409B7180BAF; Tue, 28 Mar 2017 16:00:56 +0200 (CEST) From: Andrey Konovalov To: "David S . Miller" , Eric Dumazet , Willem de Bruijn , Craig Gallek Cc: netdev@vger.kernel.org, Dmitry Vyukov , Kostya Serebryany , Andrey Konovalov Subject: [PATCH 5/5] net/packet: reorder checks for ring buffer parameters Date: Tue, 28 Mar 2017 16:00:50 +0200 Message-Id: X-Mailer: git-send-email 2.12.2.564.g063fe858b8-goog In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No semantic changes. Improves readability. Signed-off-by: Andrey Konovalov --- net/packet/af_packet.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 28b49749d1af..de25736a7988 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -4191,6 +4191,11 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, err = -EINVAL; + if (unlikely(!PAGE_ALIGNED(req->tp_block_size))) + goto out; + if (unlikely(req->tp_frame_size & (TPACKET_ALIGNMENT - 1))) + goto out; + if (unlikely(req->tp_block_size > INT_MAX)) goto out; if (unlikely(req->tp_block_size == 0)) @@ -4205,19 +4210,15 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, if (unlikely(po->tp_reserve >= req->tp_frame_size)) goto out; - if (unlikely(!PAGE_ALIGNED(req->tp_block_size))) + rb->frames_per_block = req->tp_block_size / req->tp_frame_size; + if (unlikely((rb->frames_per_block * req->tp_block_nr) != + req->tp_frame_nr)) goto out; + if (po->tp_version >= TPACKET_V3 && req->tp_block_size <= BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv)) goto out; - if (unlikely(req->tp_frame_size & (TPACKET_ALIGNMENT - 1))) - goto out; - - rb->frames_per_block = req->tp_block_size / req->tp_frame_size; - if (unlikely((rb->frames_per_block * req->tp_block_nr) != - req->tp_frame_nr)) - goto out; err = -ENOMEM; order = get_order(req->tp_block_size);