From owner-svn-src-head@freebsd.org Tue Nov 22 00:43:16 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB0A0C4D4EB; Tue, 22 Nov 2016 00:43:16 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-io0-x22c.google.com (mail-io0-x22c.google.com [IPv6:2607:f8b0:4001:c06::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 95194115B; Tue, 22 Nov 2016 00:43:16 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-io0-x22c.google.com with SMTP id j65so55168813iof.0; Mon, 21 Nov 2016 16:43:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=/piaGr8ZEZ+IA6iiymtq+i3dWcQbUZoPdFihu4QHPPk=; b=e42lvyGhoo7G0XicsG8eU+2sX2wv73Vxh0ngkJOHAzrPgWkxCcF4R8tDtO5x2AVZZa m8Qi2LdT35+w/9+k3N9FFebIjXSXSZk4Lq2t6x/242EV6VpfMk/aR/4/nNwSMKx46Drw ziulbHMdn6RMi3Nc5Mi1p67rbjyWsAP09b3wZhxIvap4wBm+QYlMJ36Pbg2Rgka8GEcU a45QLQ5LaG1p4vbJi64Aga6qK32RBnQXXZ3OICQE9QTh4ET+cJnAyK5dNCqqGZb56+8q kKKnpTXYzDfGBSCm3zOxkV8GIUD0CThyENIYaEhBGPRGdOITDNXrDFJRLc7yYCjKnwug l4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/piaGr8ZEZ+IA6iiymtq+i3dWcQbUZoPdFihu4QHPPk=; b=DxPa9EDNBx7Ga7pjBSIF+26qFIhBTMaPSb4T4RuAHkDHTLhXBMyF4UiQHVwicJ7Yom U3YSz1RuIHiEdgaYFxRkCqcbj/kPqV7rHARF/kmWwDqsj2n1iXJdPmkBIg8FTd5DS23C RvEga8EkYk+XyWo4BGeUJxNeH3W2zca2BHXyNjeAuXyFHwQv3FDUqRNXDfJY4FfjOcgf hcoso7yFuJDriHjxFsFNF2ETZu1YZnFo7qaATZcEfx33m3bvgvbqw/UTG+XrCNeIhwHr 4b4CGJo8x1EWqGBVKhXvrKLA0nUYC+o+ou4pxlyv0/WbgH3yCWntxrWN/oM17kQfdsCg iPcQ== X-Gm-Message-State: AKaTC01HeywBq/6numFHVU8LlwAZyfZzuY4pli7uQNykMhA+e0dgS75vJUoUMGzIoBo4s0uS1ux4KCPTr/5GNw== X-Received: by 10.107.136.86 with SMTP id k83mr13080749iod.99.1479775395645; Mon, 21 Nov 2016 16:43:15 -0800 (PST) MIME-Version: 1.0 Received: by 10.36.39.134 with HTTP; Mon, 21 Nov 2016 16:43:14 -0800 (PST) In-Reply-To: <201609221241.u8MCfsvv097499@repo.freebsd.org> References: <201609221241.u8MCfsvv097499@repo.freebsd.org> From: Adrian Chadd Date: Mon, 21 Nov 2016 16:43:14 -0800 Message-ID: Subject: Re: svn commit: r306186 - head/sys/kern To: Ruslan Bukin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Nov 2016 00:43:16 -0000 Hi, For reference - this breaks sooptcopyin() on MIPS32 BE. Undoing this commit fixes things. :) (it breaks ipfw. ) -adrian On 22 September 2016 at 05:41, Ruslan Bukin wrote: > Author: br > Date: Thu Sep 22 12:41:53 2016 > New Revision: 306186 > URL: https://svnweb.freebsd.org/changeset/base/306186 > > Log: > Adjust the sopt_val pointer on bigendian systems (e.g. MIPS64EB). > > sooptcopyin() checks if size of data provided by user is <= than we can > accept, else it strips down the size. On bigendian platforms we have to > move pointer as well so we copy the actual data. > > Reviewed by: gnn > Sponsored by: DARPA, AFRL > Sponsored by: HEIF5 > Differential Revision: https://reviews.freebsd.org/D7980 > > Modified: > head/sys/kern/uipc_socket.c > > Modified: head/sys/kern/uipc_socket.c > ============================================================================== > --- head/sys/kern/uipc_socket.c Thu Sep 22 12:08:26 2016 (r306185) > +++ head/sys/kern/uipc_socket.c Thu Sep 22 12:41:53 2016 (r306186) > @@ -2455,8 +2455,12 @@ sooptcopyin(struct sockopt *sopt, void * > */ > if ((valsize = sopt->sopt_valsize) < minlen) > return EINVAL; > - if (valsize > len) > + if (valsize > len) { > +#if _BYTE_ORDER == _BIG_ENDIAN > + sopt->sopt_val = (void *)((uintptr_t)sopt->sopt_val + (valsize - len)); > +#endif > sopt->sopt_valsize = valsize = len; > + } > > if (sopt->sopt_td != NULL) > return (copyin(sopt->sopt_val, buf, valsize)); >