From patchwork Tue Oct 17 00:29:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 826658 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="G/y+yh7H"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGGmr45kVz9sBZ for ; Tue, 17 Oct 2017 11:49:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933376AbdJQArf (ORCPT ); Mon, 16 Oct 2017 20:47:35 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:45284 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933256AbdJQArc (ORCPT ); Mon, 16 Oct 2017 20:47:32 -0400 Received: by mail-pg0-f51.google.com with SMTP id b192so79324pga.2 for ; Mon, 16 Oct 2017 17:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gHzQEuOKxWqtzWw7nNmq+II9lD+Gdq2BkpfNjihBl8Y=; b=G/y+yh7HhMnYAOH9lD2xgYnO6BObrhylcpoL5aGEzPyN2uPAp0HfNNzhNgn+/iFqs/ vy9FeyMm2utoAPV6vsMEyUg/HlF1fEH1oKP8CRDOnex3Rjdlkq0HLZL6jF6jqaxyYLgr Qp649dbkuZybc+ZFQ3icNG2MqteZ+gvDS5Ax8= 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; bh=gHzQEuOKxWqtzWw7nNmq+II9lD+Gdq2BkpfNjihBl8Y=; b=qUk2JHXeDqc05HeKeBOvvSEOKnhz2HGBaqgBYUkLc8TQvIQ6Ojr2LenTYO9sjyd6Vo TGEbvQ3RXXKGNu3nKJ6eYyeKei9yHGTzOXmugc4KsGaytmdl6BnnU7mI3VRWwt2WYBsr 2cK3bEbnXId5FEwvZhRUJq2Q06i0HfsBYTGR0l+WgTS4qKw5clBkzgJkkhRtOM1HfYjs gEn4qQoqrmpTVst8iqGnMqE0yfHQvP0NvlZ5IrfvFQDcKxj9ysshtCh8HDaKqOi8IdKe 7aVIY+cQBYSleL2jFNuYhpeRVJWkcDjSEQTPV+Qm3TL6xvWuvlG1KXJndtADNldPWKy/ mKvg== X-Gm-Message-State: AMCzsaUELNa5goIHkN44jB5LhIT15tbZ8pu2Wru9KPYlIlw7RPZtoK3S mzqRuQvZ2u/tyzi30FroDTNNdw== X-Google-Smtp-Source: AOwi7QB/GzXiLgHAicgaMDU2gnVp1W66J9aHB+RDsYgxUzopOxSie9xqMiG0f7oFZNuO/5XeJA+vcA== X-Received: by 10.159.253.142 with SMTP id q14mr10452159pls.82.1508201251823; Mon, 16 Oct 2017 17:47:31 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id m25sm9510902pfg.49.2017.10.16.17.47.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:47:29 -0700 (PDT) From: Kees Cook To: "David S. Miller" Cc: Kees Cook , Jeff Dike , Richard Weinberger , Jarod Wilson , user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, netdev@vger.kernel.org, Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH 56/58] um: net: Convert timers to use timer_setup() Date: Mon, 16 Oct 2017 17:29:40 -0700 Message-Id: <1508200182-104605-57-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org> References: <1508200182-104605-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. (Note that this timer is actually disabled.) Cc: Jeff Dike Cc: Richard Weinberger Cc: "David S. Miller" Cc: Jarod Wilson Cc: user-mode-linux-devel@lists.sourceforge.net Cc: user-mode-linux-user@lists.sourceforge.net Signed-off-by: Kees Cook --- arch/um/drivers/net_kern.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 1669240c7a25..b305f8247909 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c @@ -168,7 +168,6 @@ static int uml_net_open(struct net_device *dev) goto out_close; } - lp->tl.data = (unsigned long) &lp->user; netif_start_queue(dev); /* clear buffer - it can happen that the host side of the interface @@ -278,10 +277,11 @@ static const struct ethtool_ops uml_net_ethtool_ops = { .get_ts_info = ethtool_op_get_ts_info, }; -static void uml_net_user_timer_expire(unsigned long _conn) +static void uml_net_user_timer_expire(struct timer_list *t) { #ifdef undef - struct connection *conn = (struct connection *)_conn; + struct uml_net_private *lp = from_timer(lp, t, tl); + struct connection *conn = &lp->user; dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn); do_connect(conn); @@ -458,9 +458,8 @@ static void eth_configure(int n, void *init, char *mac, .add_address = transport->user->add_address, .delete_address = transport->user->delete_address }); - init_timer(&lp->tl); + timer_setup(&lp->tl, uml_net_user_timer_expire, 0); spin_lock_init(&lp->lock); - lp->tl.function = uml_net_user_timer_expire; memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac)); if ((transport->user->init != NULL) &&