Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp23963imu; Thu, 8 Nov 2018 14:05:45 -0800 (PST) X-Google-Smtp-Source: AJdET5d2elyEy07DPIBZyoKQQCFC/uLOEsr8raANYNVz/b0GU8jQl3mwBFXe5X2ViQl6qbBFG9az X-Received: by 2002:a62:1b4f:: with SMTP id b76-v6mr6325018pfb.96.1541714745329; Thu, 08 Nov 2018 14:05:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541714745; cv=none; d=google.com; s=arc-20160816; b=05AdunFTQDjEVaKb72ySgWh7lq0+VXcvuWf2j2t3T9/qkukWpu8WiP8DzgqKNhlqhx kK5mj+VedyhuUXwZV/V57g0ZoWNlREHYvJkvYnQcStvAy743I8hTWNN7yYzDLFDAOtMS 7pW3nOr2S3VMLCicIMwyyOvwJIri/cZ/XX4Q60wLyCbfScMYZQn/r8cSnY31RcolxIkv 8W37GQnCzqF2MMBKABs4vDb3i8cmYQivy6nRym6HcP5BnSLIdME45DJ+LhLVo/6PbaRu yAYakk37xXQka60ZsU4W0d8bAEgFIPyor/gLlQ0VLqaMKCkT7iqgiJB91u+T+ei7kaig F77g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5CkJOZ2ZXu1vo3yCwot1Ixv833DtMQmDJ2lV/sQ4ZYo=; b=uOeIebZvs+A0i8GVO7X/XX7hgENMs9WCKRPCvFpcTXTr8htdiGIPgdv3kme7XVC9am F2hhheXV8icgsFACsB3d2aENLbtlu3GuI7Ql3Mr+y4/nQs4L+FW9+M3GUC89Shrkhs+W Sl5JmTJShUTqcBuJHLto4PeA/4VMotK5wTRNEkKLlcGpgt2Y0hSY35/bGPAGPFRT3XTb xiMQwLX0HCugIPmM/5WI83CYTKvaX2OWP255IF26vS5jfzBpHH7PA9VTeaqZeWURZY0z /N+NfVpDDnAOcPozHm7j0hLHVXiXPBoEX0awzXD3fVtheVdB/n5jCcdLcKHDRUS7ydXT M1cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g6r+ICX4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3-v6si5305315plp.323.2018.11.08.14.05.29; Thu, 08 Nov 2018 14:05:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g6r+ICX4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731098AbeKIHjw (ORCPT + 99 others); Fri, 9 Nov 2018 02:39:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:59696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727045AbeKIHjv (ORCPT ); Fri, 9 Nov 2018 02:39:51 -0500 Received: from localhost (unknown [208.72.13.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D402720892; Thu, 8 Nov 2018 22:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541714541; bh=PcWmUmZgrzIWMaDaYRXJgtqScoW5RMtl9DjvEqRO9n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g6r+ICX4aL3LVLZbS81cNgG0yeTjrslEOG7HafHZyUYDLOtvWvsyatVo9O6BIIv5P fpVc0DQKXsx9a1TDwK+mh+09Mq/fiRm7UAK6KZR3OdIdhOyEagNn7MrSVawiUaWiFl 5zr1rrXKkaJ1fYigVh/zblYYKULxhOXz7WwOOFY0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 021/171] ax88179_178a: Check for supported Wake-on-LAN modes Date: Thu, 8 Nov 2018 13:49:51 -0800 Message-Id: <20181108215128.780345130@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181108215127.257643509@linuxfoundation.org> References: <20181108215127.257643509@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 5ba6b4aa9a410c5e2c6417df52b5e2118ea9b467 ] The driver currently silently accepts unsupported Wake-on-LAN modes (other than WAKE_PHY or WAKE_MAGIC) without reporting that to the user, which is confusing. Fixes: e2ca90c276e1 ("ax88179_178a: ASIX AX88179_178A USB 3.0/2.0 to gigabit ethernet adapter driver") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/ax88179_178a.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 8a6675d92b98..559af8e6ad90 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -566,6 +566,9 @@ ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo) struct usbnet *dev = netdev_priv(net); u8 opt = 0; + if (wolinfo->wolopts & ~(WAKE_PHY | WAKE_MAGIC)) + return -EINVAL; + if (wolinfo->wolopts & WAKE_PHY) opt |= AX_MONITOR_MODE_RWLC; if (wolinfo->wolopts & WAKE_MAGIC) -- 2.17.1