Message ID | 20200630103844.16633-3-karlp@etactica.com |
---|---|
State | Accepted |
Delegated to: | Petr Štetiar |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=etactica.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=AmIF0HuS; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=eTactica.onmicrosoft.com header.i=@eTactica.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-eTactica-onmicrosoft-com header.b=QQM4F1XV; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49x1CR0FnSz9sDX for <incoming@patchwork.ozlabs.org>; Tue, 30 Jun 2020 20:42:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rPmHG30i4BST4NxgYKvRmU66wU933Qw8Abyf6odwMNI=; b=AmIF0HuSjJvtUi8G0HaPywjLU Zc6apATgkXjlvwjulT1Mi1gBL+GPGLhFwBQLhhTR7HyE/Mkq0USGa+Zmdt1sGjRYIgtlFCFywbSa6 3qUDuFm7AHS7dNxJrVCAwkqJvXaZSwToJij0U+pqPsXkmp2CH73tSS4xVirMBb6ij5f7CuZHHVB6x g8vTuFBbzgIp8pmgVF9uX1b3IUFO8fs9mSa4M0d25xFvBU4iuckd70y3yz4FlDm+RTJyF/Akd4tYG mUA+a+rPdrJsvhM+XSmz4wJEG0/Nu0X+oiUdVMFEiKJeVFurbKJ/IFZN7pRbX46i5WHUeWROjZAQw UzzHCL7BA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfZ-0007ew-Lm; Tue, 30 Jun 2020 10:39:17 +0000 Received: from mail-am6eur05on2122.outbound.protection.outlook.com ([40.107.22.122] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfU-0007dS-RQ for openwrt-devel@lists.openwrt.org; Tue, 30 Jun 2020 10:39:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K+lHdgAYW/uZ2EcXsziOH0HXStkRZBR/1Jlib3Qe3gE0URns7ZdCIDbnC7/f9dMiwktJHReZ8FKH2JIjKBWBlqyTL4vWgGfySfP96Duz0OJT0J6Ho2355EvycyEzrGOA2YLaOit3h5Dwus0gwPZl+PcqGk4Nsy2WKQ1KzXylfSb1u8hxK6u2EJlxiIogbEqV7Rgz7svzSKEKiIk3+fRND8w9QBGxlXBnMZEaGasXXzJGlDHVyRaCmZC/pzX69pN8UF6c5ZAhDFqX0BqtGh8EQB7dRe6Ir3lrsnIlF/LD81Xyp7bhC7bYavlkJCceHgOze83ZiNw9g8Sey19p1/ayJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zOZybj3iEc7iimIMbGvMTltTbIMKBBa+D6NQRmbkzik=; b=L/nxKA8RGm6yugxuLhyaeW3hV0VzzJysOfdB4Vp/eBsqem59lz6L3B4FveVCDnauwcpdHPgkSQcOtN2dOnIQ+Ofdapr//c0/FEWXcw4JUKg9qkK1oLzg0ZaLvyFFyBfW82WIfrQTX5hmqgT11WmWqtIek3hQe+2TLHFwQJTZMXeJfi9C+sBcHxig7rrZqwyKIw8H3LDd90RJtfh/Qztnt+3I/KWT9yOkw+eMqCCFRlTCuRZo/mEk9kiE3mieWImuDo/NCkP4HoDtGGnKNEpK1QIwDJXKz0NLPXbGwg4+GPXk2PCDJ9I5MVODH7zfTGj0nkpbpBLJn+LXtTgdkRs0OA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=etactica.com; dmarc=pass action=none header.from=etactica.com; dkim=pass header.d=etactica.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eTactica.onmicrosoft.com; s=selector2-eTactica-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zOZybj3iEc7iimIMbGvMTltTbIMKBBa+D6NQRmbkzik=; b=QQM4F1XV/XJcWKb9IIwQgg8B2OXIr1fqW/R6HzFSiQs7Y3/SlXxshmluJeBGdER9x02dmHToXMKUPJkC2/9vpfLPzmgLnM2lAN6hyLgwMi2WAtljHbzdM7s3Q1Eo1I0V1HgKH/utdivOAMxvu2LIMNliwUTaA5kWBrtplu19Xrk= Authentication-Results: lists.openwrt.org; dkim=none (message not signed) header.d=none;lists.openwrt.org; dmarc=none action=none header.from=etactica.com; Received: from VI1PR07MB4462.eurprd07.prod.outlook.com (20.177.54.81) by VI1PR07MB6367.eurprd07.prod.outlook.com (10.186.162.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.15; Tue, 30 Jun 2020 10:39:12 +0000 Received: from VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058]) by VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058%3]) with mapi id 15.20.3153.018; Tue, 30 Jun 2020 10:39:12 +0000 From: Karl Palsson <karlp@etactica.com> To: openwrt-devel@lists.openwrt.org Subject: [PATCH libubox 2/4] lua/uloop: make get_sock_fd capable of absolute addresses Date: Tue, 30 Jun 2020 10:38:42 +0000 Message-Id: <20200630103844.16633-3-karlp@etactica.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630103844.16633-1-karlp@etactica.com> References: <20200630103844.16633-1-karlp@etactica.com> X-ClientProxiedBy: LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) To VI1PR07MB4462.eurprd07.prod.outlook.com (2603:10a6:803:69::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from strem.lan (213.181.112.179) by LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.27 via Frontend Transport; Tue, 30 Jun 2020 10:39:11 +0000 X-Mailer: git-send-email 2.21.3 X-Originating-IP: [213.181.112.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59612a1a-b319-4641-6549-08d81ce1d3bc X-MS-TrafficTypeDiagnostic: VI1PR07MB6367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <VI1PR07MB6367C0E63E9B25E2E97E85FBDD6F0@VI1PR07MB6367.eurprd07.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 0450A714CB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JI0KWRyfBMPB5nWvScN6PkLEyD7z/0AlioLwzmIIp/UKfQ0gOV9fukcUGAOrs2BsmLQ4QH/X1BUCRB1Xl6zdDFylJeWx1Q4L5PFISZwlkQF5uRRI/GPl3uKH3Ouamr68LmcF3R9S75nIO5ID/WJlc9QXOata0UfwOP5ZuJYMtoGop2DEx30X9/g92/10ogaioo2mmT/hawxNyOUXyt0wiIbHDn/bpNWU249XjDWuyThjuvblTKJ2L53zaEh6ubk/Oz9Aj3rbFlqhwsPr0CwiXUWDuNmjuV2Z9BkJKxsBOY7Bn/ZRVCkUVKxuen3TZ5Qy6GpuJFYQBPVO/jUb11gYqQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR07MB4462.eurprd07.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(376002)(396003)(39830400003)(346002)(366004)(136003)(1076003)(52116002)(6512007)(66476007)(316002)(66946007)(66556008)(6666004)(2906002)(86362001)(4744005)(36756003)(5660300002)(8886007)(508600001)(6506007)(2616005)(956004)(83380400001)(8676002)(26005)(8936002)(4326008)(186003)(6486002)(16526019)(107886003)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 21kWbUUHqmzy6gJqlkxDWI/AU0f478bCiW2bpAjiQ498SHPuq2DwnQD9qpQWTtPAzLfV37T1IskPyLDpIaFPkPJ774NBOXFBDvfLwu+XlSPgrkrtGEjhBdw1L+9+X7qFtkrZ7oh9jZAgySpwxCtNaFviuuP+LFXU1IpMKciN3ALRFNpxBVrILcL1+AQhmcz2ruqoggJjbf2d/n/nAdGuAgXu7G1FQ9D5DUvGtDQ9mlDYLa7S358mDPJ56PDgUOo9w495j5Y/qux1EECZvepLPnVidjcXAnEbA7y+Btz5arAyMM1ld9HFG0gTy3IfBlhK03spH4Qi0Zr8n++bMZMfpGZDVaZnk6sgjgqmwPauA8qOGyJoy3qFSLhWR5UQze8a+uCLiBimx7ryRrhhZE/nEUkNqorinLHjLtFacrcAzURcKDXCGJkG62cunMUVM6dn/Nf1VWwS9eJzb67FPquaBEJ1LoqubAIjEWqwbr4knWE= X-OriginatorOrg: etactica.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59612a1a-b319-4641-6549-08d81ce1d3bc X-MS-Exchange-CrossTenant-AuthSource: VI1PR07MB4462.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2020 10:39:12.0422 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e3621586-558f-4e21-92a9-26df2c484dae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5lsJJOdyEFxgufdJDjVzNkWUdad78C6PVprY6EGpivIWI+3hKgNeOd2/c+Cxur85gQ+laXEhsThv8UZp3HDimA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB6367 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.22.122 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.22.122 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.infradead.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: <http://lists.infradead.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: Karl Palsson <karlp@etactica.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
[libubox,1/4] lua/uloop: fd_add() better args checking
|
expand
|
diff --git a/lua/uloop.c b/lua/uloop.c index fcbe274..394970d 100644 --- a/lua/uloop.c +++ b/lua/uloop.c @@ -188,7 +188,8 @@ static int get_sock_fd(lua_State* L, int idx) { lua_getfield(L, idx, "getfd"); if(lua_isnil(L, -1)) return luaL_error(L, "socket type missing 'getfd' method"); - lua_pushvalue(L, idx - 1); + /* if we have absolute, no need to adjust for getfield() call */ + lua_pushvalue(L, idx > 0 ? idx: idx - 1); lua_call(L, 1, 1); fd = lua_tointeger(L, -1); lua_pop(L, 1);
The original code required the use of relative addresses into the lua stack. It should accept either. Signed-off-by: Karl Palsson <karlp@etactica.com> --- lua/uloop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)