mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
This is the 4.14.165 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl4eEQ0ACgkQONu9yGCS aT5i7hAAhtuy6LEtpDbafLHmKEQwUmHu4dMWSVg0kzgraVVCGl9YqY8d+WgKn6dN mNxYvThWmD+ZSnwOJQnW4EdW/72S3S3FJ9ayTGUHkHj34/FkicxV803ETRGIeeTd 3aothT4kxKK2Mx99qKxg4+bJEMSdYME/ldGOQvqDMrIdf72b4U9N57902u0W7t1g XgzzxKb65qy29Icyr6XJUhEjA7dQuit2zNYIt4LUtAHkCmVXlUUVWBQ6FZNYVxIy 4Q3mPRpHvcbrHV3qWxAyA4k3XRiNCd5oYp6U2pXOoTCv1Ez6lGEXlrRb7P6W/qqq sAGTAgk5vCWtwH8Dqul3bdNWvN47+4jLko+kgFsiAbJDTUOejuNizUg6Jg8UnZnB IBj2INpvvBuurgvOzqp5kcX1Dt+EjaVTkXe0u4qiQE7iSemiRxUGsDDdrR/27JsV 83PHqRnBEHzIHKXIQdS2UhW5zprOf47CMuKP0nVb+oEEzEnbvh5nLKUoLNabD2sL KNPVqPDVNO57DPMiY4uRAQ5QUy6GcThwkFBD7ydqtpTPMQIPp0VG3h59DDE4noBX sekd6PKPHAJzVR9agx0ASrb8USDS3LBNQNGi5MiyAHn0SpoRQpyBzhJcHCXhVvFE LWBv6CfIu+igDRrGFdZCizhRQGNON0AfNEjMkN8RGG5rgCi7ofo= =Soo8 -----END PGP SIGNATURE----- Merge 4.14.165 into android-4.14 Changes in 4.14.165 chardev: Avoid potential use-after-free in 'chrdev_open()' usb: chipidea: host: Disable port power only if previously enabled ALSA: usb-audio: Apply the sample rate quirk for Bose Companion 5 ALSA: hda/realtek - Add new codec supported for ALCS1200A ALSA: hda/realtek - Set EAPD control to default for ALC222 kernel/trace: Fix do not unregister tracepoints when register sched_migrate_task fail tracing: Have stack tracer compile when MCOUNT_INSN_SIZE is not defined HID: Fix slab-out-of-bounds read in hid_field_extract HID: uhid: Fix returning EPOLLOUT from uhid_char_poll can: gs_usb: gs_usb_probe(): use descriptors of current altsetting can: mscan: mscan_rx_poll(): fix rx path lockup when returning from polling to irq mode can: can_dropped_invalid_skb(): ensure an initialized headroom in outgoing CAN sk_buffs gpiolib: acpi: Turn dmi_system_id table into a generic quirk table gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism staging: vt6656: set usb_set_intfdata on driver fail. USB: serial: option: add ZLP support for 0x1bc7/0x9010 usb: musb: fix idling for suspend after disconnect interrupt usb: musb: Disable pullup at init usb: musb: dma: Correct parameter passed to IRQ handler staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713 HID: hid-input: clear unmapped usages Input: add safety guards to input_set_keycode() drm/fb-helper: Round up bits_per_pixel if possible drm/dp_mst: correct the shifting in DP_REMOTE_I2C_READ staging: rtl8188eu: Add device code for TP-Link TL-WN727N v5.21 tty: link tty and port before configuring it as console tty: always relink the port mwifiex: fix possible heap overflow in mwifiex_process_country_ie() mwifiex: pcie: Fix memory leak in mwifiex_pcie_alloc_cmdrsp_buf scsi: bfa: release allocated memory in case of error rtl8xxxu: prevent leaking urb ath10k: fix memory leak arm64: cpufeature: Avoid warnings due to unused symbols HID: hiddev: fix mess in hiddev_open() USB: Fix: Don't skip endpoint descriptors with maxpacket=0 phy: cpcap-usb: Fix error path when no host driver is loaded phy: cpcap-usb: Fix flakey host idling and enumerating of devices netfilter: arp_tables: init netns pointer in xt_tgchk_param struct netfilter: ipset: avoid null deref when IPSET_ATTR_LINENO is present drm/i915/gen9: Clear residual context state on context switch Linux 4.14.165 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ia2165e5228d420a483a05f2145f15255047446bc
This commit is contained in:
Greg Kroah-Hartman
commit
748d727135
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 14
|
||||
SUBLEVEL = 164
|
||||
SUBLEVEL = 165
|
||||
EXTRAVERSION =
|
||||
NAME = Petit Gorille
|
||||
|
||||
|
||||
@ -804,11 +804,6 @@ static bool has_no_hw_prefetch(const struct arm64_cpu_capabilities *entry, int _
|
||||
MIDR_CPU_VAR_REV(1, MIDR_REVISION_MASK));
|
||||
}
|
||||
|
||||
static bool runs_at_el2(const struct arm64_cpu_capabilities *entry, int __unused)
|
||||
{
|
||||
return is_kernel_in_hyp_mode();
|
||||
}
|
||||
|
||||
static bool hyp_offset_low(const struct arm64_cpu_capabilities *entry,
|
||||
int __unused)
|
||||
{
|
||||
@ -942,6 +937,12 @@ static int __init parse_kpti(char *str)
|
||||
}
|
||||
early_param("kpti", parse_kpti);
|
||||
|
||||
#ifdef CONFIG_ARM64_VHE
|
||||
static bool runs_at_el2(const struct arm64_cpu_capabilities *entry, int __unused)
|
||||
{
|
||||
return is_kernel_in_hyp_mode();
|
||||
}
|
||||
|
||||
static void cpu_copy_el2regs(const struct arm64_cpu_capabilities *__unused)
|
||||
{
|
||||
/*
|
||||
@ -955,6 +956,7 @@ static void cpu_copy_el2regs(const struct arm64_cpu_capabilities *__unused)
|
||||
if (!alternatives_applied)
|
||||
write_sysreg(read_sysreg(tpidr_el1), tpidr_el2);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARM64_SSBD
|
||||
static int ssbs_emulation_handler(struct pt_regs *regs, u32 instr)
|
||||
|
||||
@ -24,11 +24,19 @@
|
||||
|
||||
#include "gpiolib.h"
|
||||
|
||||
#define QUIRK_NO_EDGE_EVENTS_ON_BOOT 0x01l
|
||||
#define QUIRK_NO_WAKEUP 0x02l
|
||||
|
||||
static int run_edge_events_on_boot = -1;
|
||||
module_param(run_edge_events_on_boot, int, 0444);
|
||||
MODULE_PARM_DESC(run_edge_events_on_boot,
|
||||
"Run edge _AEI event-handlers at boot: 0=no, 1=yes, -1=auto");
|
||||
|
||||
static int honor_wakeup = -1;
|
||||
module_param(honor_wakeup, int, 0444);
|
||||
MODULE_PARM_DESC(honor_wakeup,
|
||||
"Honor the ACPI wake-capable flag: 0=no, 1=yes, -1=auto");
|
||||
|
||||
/**
|
||||
* struct acpi_gpio_event - ACPI GPIO event handler data
|
||||
*
|
||||
@ -339,7 +347,7 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares,
|
||||
event->handle = evt_handle;
|
||||
event->handler = handler;
|
||||
event->irq = irq;
|
||||
event->irq_is_wake = agpio->wake_capable == ACPI_WAKE_CAPABLE;
|
||||
event->irq_is_wake = honor_wakeup && agpio->wake_capable == ACPI_WAKE_CAPABLE;
|
||||
event->pin = pin;
|
||||
event->desc = desc;
|
||||
|
||||
@ -1312,7 +1320,7 @@ static int acpi_gpio_handle_deferred_request_irqs(void)
|
||||
/* We must use _sync so that this runs after the first deferred_probe run */
|
||||
late_initcall_sync(acpi_gpio_handle_deferred_request_irqs);
|
||||
|
||||
static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {
|
||||
static const struct dmi_system_id gpiolib_acpi_quirks[] = {
|
||||
{
|
||||
/*
|
||||
* The Minix Neo Z83-4 has a micro-USB-B id-pin handler for
|
||||
@ -1322,7 +1330,8 @@ static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "MINIX"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),
|
||||
}
|
||||
},
|
||||
.driver_data = (void *)QUIRK_NO_EDGE_EVENTS_ON_BOOT,
|
||||
},
|
||||
{
|
||||
/*
|
||||
@ -1334,20 +1343,52 @@ static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Wortmann_AG"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "TERRA_PAD_1061"),
|
||||
}
|
||||
},
|
||||
.driver_data = (void *)QUIRK_NO_EDGE_EVENTS_ON_BOOT,
|
||||
},
|
||||
{
|
||||
/*
|
||||
* Various HP X2 10 Cherry Trail models use an external
|
||||
* embedded-controller connected via I2C + an ACPI GPIO
|
||||
* event handler. The embedded controller generates various
|
||||
* spurious wakeup events when suspended. So disable wakeup
|
||||
* for its handler (it uses the only ACPI GPIO event handler).
|
||||
* This breaks wakeup when opening the lid, the user needs
|
||||
* to press the power-button to wakeup the system. The
|
||||
* alternative is suspend simply not working, which is worse.
|
||||
*/
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "HP"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "HP x2 Detachable 10-p0XX"),
|
||||
},
|
||||
.driver_data = (void *)QUIRK_NO_WAKEUP,
|
||||
},
|
||||
{} /* Terminating entry */
|
||||
};
|
||||
|
||||
static int acpi_gpio_setup_params(void)
|
||||
{
|
||||
const struct dmi_system_id *id;
|
||||
long quirks = 0;
|
||||
|
||||
id = dmi_first_match(gpiolib_acpi_quirks);
|
||||
if (id)
|
||||
quirks = (long)id->driver_data;
|
||||
|
||||
if (run_edge_events_on_boot < 0) {
|
||||
if (dmi_check_system(run_edge_events_on_boot_blacklist))
|
||||
if (quirks & QUIRK_NO_EDGE_EVENTS_ON_BOOT)
|
||||
run_edge_events_on_boot = 0;
|
||||
else
|
||||
run_edge_events_on_boot = 1;
|
||||
}
|
||||
|
||||
if (honor_wakeup < 0) {
|
||||
if (quirks & QUIRK_NO_WAKEUP)
|
||||
honor_wakeup = 0;
|
||||
else
|
||||
honor_wakeup = 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -274,7 +274,7 @@ static void drm_dp_encode_sideband_req(struct drm_dp_sideband_msg_req_body *req,
|
||||
memcpy(&buf[idx], req->u.i2c_read.transactions[i].bytes, req->u.i2c_read.transactions[i].num_bytes);
|
||||
idx += req->u.i2c_read.transactions[i].num_bytes;
|
||||
|
||||
buf[idx] = (req->u.i2c_read.transactions[i].no_stop_bit & 0x1) << 5;
|
||||
buf[idx] = (req->u.i2c_read.transactions[i].no_stop_bit & 0x1) << 4;
|
||||
buf[idx] |= (req->u.i2c_read.transactions[i].i2c_transaction_delay & 0xf);
|
||||
idx++;
|
||||
}
|
||||
|
||||
@ -1590,7 +1590,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
|
||||
* Changes struct fb_var_screeninfo are currently not pushed back
|
||||
* to KMS, hence fail if different settings are requested.
|
||||
*/
|
||||
if (var->bits_per_pixel != fb->format->cpp[0] * 8 ||
|
||||
if (var->bits_per_pixel > fb->format->cpp[0] * 8 ||
|
||||
var->xres > fb->width || var->yres > fb->height ||
|
||||
var->xres_virtual > fb->width || var->yres_virtual > fb->height) {
|
||||
DRM_DEBUG("fb requested width/height/bpp can't fit in current fb "
|
||||
@ -1615,6 +1615,11 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
|
||||
drm_fb_helper_fill_pixel_fmt(var, fb->format->depth);
|
||||
}
|
||||
|
||||
/*
|
||||
* Likewise, bits_per_pixel should be rounded up to a supported value.
|
||||
*/
|
||||
var->bits_per_pixel = fb->format->cpp[0] * 8;
|
||||
|
||||
/*
|
||||
* drm fbdev emulation doesn't support changing the pixel format at all,
|
||||
* so reject all pixel format changing requests.
|
||||
|
||||
@ -1101,17 +1101,14 @@ static u32 *gen9_init_indirectctx_bb(struct intel_engine_cs *engine, u32 *batch)
|
||||
|
||||
*batch++ = MI_NOOP;
|
||||
|
||||
/* WaClearSlmSpaceAtContextSwitch:kbl */
|
||||
/* Actual scratch location is at 128 bytes offset */
|
||||
if (IS_KBL_REVID(engine->i915, 0, KBL_REVID_A0)) {
|
||||
batch = gen8_emit_pipe_control(batch,
|
||||
PIPE_CONTROL_FLUSH_L3 |
|
||||
PIPE_CONTROL_GLOBAL_GTT_IVB |
|
||||
PIPE_CONTROL_CS_STALL |
|
||||
PIPE_CONTROL_QW_WRITE,
|
||||
i915_ggtt_offset(engine->scratch)
|
||||
+ 2 * CACHELINE_BYTES);
|
||||
}
|
||||
/* WaClearSlmSpaceAtContextSwitch:skl,bxt,kbl,glk,cfl */
|
||||
batch = gen8_emit_pipe_control(batch,
|
||||
PIPE_CONTROL_FLUSH_L3 |
|
||||
PIPE_CONTROL_GLOBAL_GTT_IVB |
|
||||
PIPE_CONTROL_CS_STALL |
|
||||
PIPE_CONTROL_QW_WRITE,
|
||||
i915_ggtt_offset(engine->scratch) +
|
||||
2 * CACHELINE_BYTES);
|
||||
|
||||
/* WaMediaPoolStateCmdInWABB:bxt,glk */
|
||||
if (HAS_POOLED_EU(engine->i915)) {
|
||||
|
||||
@ -268,6 +268,12 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
|
||||
offset = report->size;
|
||||
report->size += parser->global.report_size * parser->global.report_count;
|
||||
|
||||
/* Total size check: Allow for possible report index byte */
|
||||
if (report->size > (HID_MAX_BUFFER_SIZE - 1) << 3) {
|
||||
hid_err(parser->device, "report is too long\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!parser->local.usage_index) /* Ignore padding fields */
|
||||
return 0;
|
||||
|
||||
|
||||
@ -1116,9 +1116,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
|
||||
}
|
||||
|
||||
mapped:
|
||||
if (device->driver->input_mapped && device->driver->input_mapped(device,
|
||||
hidinput, field, usage, &bit, &max) < 0)
|
||||
goto ignore;
|
||||
if (device->driver->input_mapped &&
|
||||
device->driver->input_mapped(device, hidinput, field, usage,
|
||||
&bit, &max) < 0) {
|
||||
/*
|
||||
* The driver indicated that no further generic handling
|
||||
* of the usage is desired.
|
||||
*/
|
||||
return;
|
||||
}
|
||||
|
||||
set_bit(usage->type, input->evbit);
|
||||
|
||||
@ -1176,9 +1182,11 @@ mapped:
|
||||
set_bit(MSC_SCAN, input->mscbit);
|
||||
}
|
||||
|
||||
ignore:
|
||||
return;
|
||||
|
||||
ignore:
|
||||
usage->type = 0;
|
||||
usage->code = 0;
|
||||
}
|
||||
|
||||
void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/uhid.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/eventpoll.h>
|
||||
|
||||
#define UHID_NAME "uhid"
|
||||
#define UHID_BUFSIZE 32
|
||||
@ -774,7 +775,7 @@ static unsigned int uhid_char_poll(struct file *file, poll_table *wait)
|
||||
if (uhid->head != uhid->tail)
|
||||
return POLLIN | POLLRDNORM;
|
||||
|
||||
return 0;
|
||||
return EPOLLOUT | EPOLLWRNORM;
|
||||
}
|
||||
|
||||
static const struct file_operations uhid_fops = {
|
||||
|
||||
@ -254,12 +254,51 @@ static int hiddev_release(struct inode * inode, struct file * file)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __hiddev_open(struct hiddev *hiddev, struct file *file)
|
||||
{
|
||||
struct hiddev_list *list;
|
||||
int error;
|
||||
|
||||
lockdep_assert_held(&hiddev->existancelock);
|
||||
|
||||
list = vzalloc(sizeof(*list));
|
||||
if (!list)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_init(&list->thread_lock);
|
||||
list->hiddev = hiddev;
|
||||
|
||||
if (!hiddev->open++) {
|
||||
error = hid_hw_power(hiddev->hid, PM_HINT_FULLON);
|
||||
if (error < 0)
|
||||
goto err_drop_count;
|
||||
|
||||
error = hid_hw_open(hiddev->hid);
|
||||
if (error < 0)
|
||||
goto err_normal_power;
|
||||
}
|
||||
|
||||
spin_lock_irq(&hiddev->list_lock);
|
||||
list_add_tail(&list->node, &hiddev->list);
|
||||
spin_unlock_irq(&hiddev->list_lock);
|
||||
|
||||
file->private_data = list;
|
||||
|
||||
return 0;
|
||||
|
||||
err_normal_power:
|
||||
hid_hw_power(hiddev->hid, PM_HINT_NORMAL);
|
||||
err_drop_count:
|
||||
hiddev->open--;
|
||||
vfree(list);
|
||||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* open file op
|
||||
*/
|
||||
static int hiddev_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct hiddev_list *list;
|
||||
struct usb_interface *intf;
|
||||
struct hid_device *hid;
|
||||
struct hiddev *hiddev;
|
||||
@ -268,66 +307,14 @@ static int hiddev_open(struct inode *inode, struct file *file)
|
||||
intf = usbhid_find_interface(iminor(inode));
|
||||
if (!intf)
|
||||
return -ENODEV;
|
||||
|
||||
hid = usb_get_intfdata(intf);
|
||||
hiddev = hid->hiddev;
|
||||
|
||||
if (!(list = vzalloc(sizeof(struct hiddev_list))))
|
||||
return -ENOMEM;
|
||||
mutex_init(&list->thread_lock);
|
||||
list->hiddev = hiddev;
|
||||
file->private_data = list;
|
||||
|
||||
/*
|
||||
* no need for locking because the USB major number
|
||||
* is shared which usbcore guards against disconnect
|
||||
*/
|
||||
if (list->hiddev->exist) {
|
||||
if (!list->hiddev->open++) {
|
||||
res = hid_hw_open(hiddev->hid);
|
||||
if (res < 0)
|
||||
goto bail;
|
||||
}
|
||||
} else {
|
||||
res = -ENODEV;
|
||||
goto bail;
|
||||
}
|
||||
|
||||
spin_lock_irq(&list->hiddev->list_lock);
|
||||
list_add_tail(&list->node, &hiddev->list);
|
||||
spin_unlock_irq(&list->hiddev->list_lock);
|
||||
|
||||
mutex_lock(&hiddev->existancelock);
|
||||
/*
|
||||
* recheck exist with existance lock held to
|
||||
* avoid opening a disconnected device
|
||||
*/
|
||||
if (!list->hiddev->exist) {
|
||||
res = -ENODEV;
|
||||
goto bail_unlock;
|
||||
}
|
||||
if (!list->hiddev->open++)
|
||||
if (list->hiddev->exist) {
|
||||
struct hid_device *hid = hiddev->hid;
|
||||
res = hid_hw_power(hid, PM_HINT_FULLON);
|
||||
if (res < 0)
|
||||
goto bail_unlock;
|
||||
res = hid_hw_open(hid);
|
||||
if (res < 0)
|
||||
goto bail_normal_power;
|
||||
}
|
||||
mutex_unlock(&hiddev->existancelock);
|
||||
return 0;
|
||||
bail_normal_power:
|
||||
hid_hw_power(hid, PM_HINT_NORMAL);
|
||||
bail_unlock:
|
||||
res = hiddev->exist ? __hiddev_open(hiddev, file) : -ENODEV;
|
||||
mutex_unlock(&hiddev->existancelock);
|
||||
|
||||
spin_lock_irq(&list->hiddev->list_lock);
|
||||
list_del(&list->node);
|
||||
spin_unlock_irq(&list->hiddev->list_lock);
|
||||
bail:
|
||||
file->private_data = NULL;
|
||||
vfree(list);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
@ -858,16 +858,18 @@ static int input_default_setkeycode(struct input_dev *dev,
|
||||
}
|
||||
}
|
||||
|
||||
__clear_bit(*old_keycode, dev->keybit);
|
||||
__set_bit(ke->keycode, dev->keybit);
|
||||
|
||||
for (i = 0; i < dev->keycodemax; i++) {
|
||||
if (input_fetch_keycode(dev, i) == *old_keycode) {
|
||||
__set_bit(*old_keycode, dev->keybit);
|
||||
break; /* Setting the bit twice is useless, so break */
|
||||
if (*old_keycode <= KEY_MAX) {
|
||||
__clear_bit(*old_keycode, dev->keybit);
|
||||
for (i = 0; i < dev->keycodemax; i++) {
|
||||
if (input_fetch_keycode(dev, i) == *old_keycode) {
|
||||
__set_bit(*old_keycode, dev->keybit);
|
||||
/* Setting the bit twice is useless, so break */
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
__set_bit(ke->keycode, dev->keybit);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -923,9 +925,13 @@ int input_set_keycode(struct input_dev *dev,
|
||||
* Simulate keyup event if keycode is not present
|
||||
* in the keymap anymore
|
||||
*/
|
||||
if (test_bit(EV_KEY, dev->evbit) &&
|
||||
!is_event_supported(old_keycode, dev->keybit, KEY_MAX) &&
|
||||
__test_and_clear_bit(old_keycode, dev->key)) {
|
||||
if (old_keycode > KEY_MAX) {
|
||||
dev_warn(dev->dev.parent ?: &dev->dev,
|
||||
"%s: got too big old keycode %#x\n",
|
||||
__func__, old_keycode);
|
||||
} else if (test_bit(EV_KEY, dev->evbit) &&
|
||||
!is_event_supported(old_keycode, dev->keybit, KEY_MAX) &&
|
||||
__test_and_clear_bit(old_keycode, dev->key)) {
|
||||
struct input_value vals[] = {
|
||||
{ EV_KEY, old_keycode, 0 },
|
||||
input_value_sync
|
||||
|
||||
@ -392,13 +392,12 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)
|
||||
struct net_device *dev = napi->dev;
|
||||
struct mscan_regs __iomem *regs = priv->reg_base;
|
||||
struct net_device_stats *stats = &dev->stats;
|
||||
int npackets = 0;
|
||||
int ret = 1;
|
||||
int work_done = 0;
|
||||
struct sk_buff *skb;
|
||||
struct can_frame *frame;
|
||||
u8 canrflg;
|
||||
|
||||
while (npackets < quota) {
|
||||
while (work_done < quota) {
|
||||
canrflg = in_8(®s->canrflg);
|
||||
if (!(canrflg & (MSCAN_RXF | MSCAN_ERR_IF)))
|
||||
break;
|
||||
@ -419,18 +418,18 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)
|
||||
|
||||
stats->rx_packets++;
|
||||
stats->rx_bytes += frame->can_dlc;
|
||||
npackets++;
|
||||
work_done++;
|
||||
netif_receive_skb(skb);
|
||||
}
|
||||
|
||||
if (!(in_8(®s->canrflg) & (MSCAN_RXF | MSCAN_ERR_IF))) {
|
||||
napi_complete(&priv->napi);
|
||||
clear_bit(F_RX_PROGRESS, &priv->flags);
|
||||
if (priv->can.state < CAN_STATE_BUS_OFF)
|
||||
out_8(®s->canrier, priv->shadow_canrier);
|
||||
ret = 0;
|
||||
if (work_done < quota) {
|
||||
if (likely(napi_complete_done(&priv->napi, work_done))) {
|
||||
clear_bit(F_RX_PROGRESS, &priv->flags);
|
||||
if (priv->can.state < CAN_STATE_BUS_OFF)
|
||||
out_8(®s->canrier, priv->shadow_canrier);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
return work_done;
|
||||
}
|
||||
|
||||
static irqreturn_t mscan_isr(int irq, void *dev_id)
|
||||
|
||||
@ -926,7 +926,7 @@ static int gs_usb_probe(struct usb_interface *intf,
|
||||
GS_USB_BREQ_HOST_FORMAT,
|
||||
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
|
||||
1,
|
||||
intf->altsetting[0].desc.bInterfaceNumber,
|
||||
intf->cur_altsetting->desc.bInterfaceNumber,
|
||||
hconf,
|
||||
sizeof(*hconf),
|
||||
1000);
|
||||
@ -949,7 +949,7 @@ static int gs_usb_probe(struct usb_interface *intf,
|
||||
GS_USB_BREQ_DEVICE_CONFIG,
|
||||
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
|
||||
1,
|
||||
intf->altsetting[0].desc.bInterfaceNumber,
|
||||
intf->cur_altsetting->desc.bInterfaceNumber,
|
||||
dconf,
|
||||
sizeof(*dconf),
|
||||
1000);
|
||||
|
||||
@ -454,6 +454,7 @@ static int ath10k_usb_hif_tx_sg(struct ath10k *ar, u8 pipe_id,
|
||||
ath10k_dbg(ar, ATH10K_DBG_USB_BULK,
|
||||
"usb bulk transmit failed: %d\n", ret);
|
||||
usb_unanchor_urb(urb);
|
||||
usb_free_urb(urb);
|
||||
ret = -EINVAL;
|
||||
goto err_free_urb_to_pipe;
|
||||
}
|
||||
|
||||
@ -1022,8 +1022,10 @@ static int mwifiex_pcie_alloc_cmdrsp_buf(struct mwifiex_adapter *adapter)
|
||||
}
|
||||
skb_put(skb, MWIFIEX_UPLD_SIZE);
|
||||
if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
|
||||
PCI_DMA_FROMDEVICE))
|
||||
PCI_DMA_FROMDEVICE)) {
|
||||
kfree_skb(skb);
|
||||
return -1;
|
||||
}
|
||||
|
||||
card->cmdrsp_buf = skb;
|
||||
|
||||
|
||||
@ -271,6 +271,14 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv,
|
||||
"11D: skip setting domain info in FW\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (country_ie_len >
|
||||
(IEEE80211_COUNTRY_STRING_LEN + MWIFIEX_MAX_TRIPLET_802_11D)) {
|
||||
mwifiex_dbg(priv->adapter, ERROR,
|
||||
"11D: country_ie_len overflow!, deauth AP\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
memcpy(priv->adapter->country_code, &country_ie[2], 2);
|
||||
|
||||
domain_info->country_code[0] = country_ie[2];
|
||||
@ -314,8 +322,9 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
|
||||
priv->scan_block = false;
|
||||
|
||||
if (bss) {
|
||||
if (adapter->region_code == 0x00)
|
||||
mwifiex_process_country_ie(priv, bss);
|
||||
if (adapter->region_code == 0x00 &&
|
||||
mwifiex_process_country_ie(priv, bss))
|
||||
return -EINVAL;
|
||||
|
||||
/* Allocate and fill new bss descriptor */
|
||||
bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor),
|
||||
|
||||
@ -5453,6 +5453,7 @@ static int rtl8xxxu_submit_int_urb(struct ieee80211_hw *hw)
|
||||
ret = usb_submit_urb(urb, GFP_KERNEL);
|
||||
if (ret) {
|
||||
usb_unanchor_urb(urb);
|
||||
usb_free_urb(urb);
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
||||
@ -207,6 +207,19 @@ static int cpcap_phy_get_ints_state(struct cpcap_phy_ddata *ddata,
|
||||
static int cpcap_usb_set_uart_mode(struct cpcap_phy_ddata *ddata);
|
||||
static int cpcap_usb_set_usb_mode(struct cpcap_phy_ddata *ddata);
|
||||
|
||||
static void cpcap_usb_try_musb_mailbox(struct cpcap_phy_ddata *ddata,
|
||||
enum musb_vbus_id_status status)
|
||||
{
|
||||
int error;
|
||||
|
||||
error = musb_mailbox(status);
|
||||
if (!error)
|
||||
return;
|
||||
|
||||
dev_dbg(ddata->dev, "%s: musb_mailbox failed: %i\n",
|
||||
__func__, error);
|
||||
}
|
||||
|
||||
static void cpcap_usb_detect(struct work_struct *work)
|
||||
{
|
||||
struct cpcap_phy_ddata *ddata;
|
||||
@ -226,9 +239,7 @@ static void cpcap_usb_detect(struct work_struct *work)
|
||||
if (error)
|
||||
goto out_err;
|
||||
|
||||
error = musb_mailbox(MUSB_ID_GROUND);
|
||||
if (error)
|
||||
goto out_err;
|
||||
cpcap_usb_try_musb_mailbox(ddata, MUSB_ID_GROUND);
|
||||
|
||||
error = regmap_update_bits(ddata->reg, CPCAP_REG_USBC3,
|
||||
CPCAP_BIT_VBUSSTBY_EN,
|
||||
@ -255,9 +266,7 @@ static void cpcap_usb_detect(struct work_struct *work)
|
||||
error = cpcap_usb_set_usb_mode(ddata);
|
||||
if (error)
|
||||
goto out_err;
|
||||
error = musb_mailbox(MUSB_ID_GROUND);
|
||||
if (error)
|
||||
goto out_err;
|
||||
cpcap_usb_try_musb_mailbox(ddata, MUSB_ID_GROUND);
|
||||
|
||||
return;
|
||||
}
|
||||
@ -267,22 +276,18 @@ static void cpcap_usb_detect(struct work_struct *work)
|
||||
error = cpcap_usb_set_usb_mode(ddata);
|
||||
if (error)
|
||||
goto out_err;
|
||||
error = musb_mailbox(MUSB_VBUS_VALID);
|
||||
if (error)
|
||||
goto out_err;
|
||||
cpcap_usb_try_musb_mailbox(ddata, MUSB_VBUS_VALID);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
cpcap_usb_try_musb_mailbox(ddata, MUSB_VBUS_OFF);
|
||||
|
||||
/* Default to debug UART mode */
|
||||
error = cpcap_usb_set_uart_mode(ddata);
|
||||
if (error)
|
||||
goto out_err;
|
||||
|
||||
error = musb_mailbox(MUSB_VBUS_OFF);
|
||||
if (error)
|
||||
goto out_err;
|
||||
|
||||
dev_dbg(ddata->dev, "set UART mode\n");
|
||||
|
||||
return;
|
||||
@ -647,9 +652,7 @@ static int cpcap_usb_phy_remove(struct platform_device *pdev)
|
||||
if (error)
|
||||
dev_err(ddata->dev, "could not set UART mode\n");
|
||||
|
||||
error = musb_mailbox(MUSB_VBUS_OFF);
|
||||
if (error)
|
||||
dev_err(ddata->dev, "could not set mailbox\n");
|
||||
cpcap_usb_try_musb_mailbox(ddata, MUSB_VBUS_OFF);
|
||||
|
||||
usb_remove_phy(&ddata->phy);
|
||||
cancel_delayed_work_sync(&ddata->detect_work);
|
||||
|
||||
@ -283,8 +283,10 @@ bfad_im_get_stats(struct Scsi_Host *shost)
|
||||
rc = bfa_port_get_stats(BFA_FCPORT(&bfad->bfa),
|
||||
fcstats, bfad_hcb_comp, &fcomp);
|
||||
spin_unlock_irqrestore(&bfad->bfad_lock, flags);
|
||||
if (rc != BFA_STATUS_OK)
|
||||
if (rc != BFA_STATUS_OK) {
|
||||
kfree(fcstats);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
wait_for_completion(&fcomp.comp);
|
||||
|
||||
|
||||
@ -45,8 +45,8 @@
|
||||
#define PCI171X_RANGE_UNI BIT(4)
|
||||
#define PCI171X_RANGE_GAIN(x) (((x) & 0x7) << 0)
|
||||
#define PCI171X_MUX_REG 0x04 /* W: A/D multiplexor control */
|
||||
#define PCI171X_MUX_CHANH(x) (((x) & 0xf) << 8)
|
||||
#define PCI171X_MUX_CHANL(x) (((x) & 0xf) << 0)
|
||||
#define PCI171X_MUX_CHANH(x) (((x) & 0xff) << 8)
|
||||
#define PCI171X_MUX_CHANL(x) (((x) & 0xff) << 0)
|
||||
#define PCI171X_MUX_CHAN(x) (PCI171X_MUX_CHANH(x) | PCI171X_MUX_CHANL(x))
|
||||
#define PCI171X_STATUS_REG 0x06 /* R: status register */
|
||||
#define PCI171X_STATUS_IRQ BIT(11) /* 1=IRQ occurred */
|
||||
|
||||
@ -45,6 +45,7 @@ static const struct usb_device_id rtw_usb_id_tbl[] = {
|
||||
{USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */
|
||||
{USB_DEVICE(0x2001, 0x331B)}, /* D-Link DWA-121 rev B1 */
|
||||
{USB_DEVICE(0x2357, 0x010c)}, /* TP-Link TL-WN722N v2 */
|
||||
{USB_DEVICE(0x2357, 0x0111)}, /* TP-Link TL-WN727N v5.21 */
|
||||
{USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill RNX-N150NUB */
|
||||
{} /* Terminating entry */
|
||||
|
||||
@ -269,6 +269,7 @@ struct vnt_private {
|
||||
u8 mac_hw;
|
||||
/* netdev */
|
||||
struct usb_device *usb;
|
||||
struct usb_interface *intf;
|
||||
|
||||
u64 tsf_time;
|
||||
u8 rx_rate;
|
||||
|
||||
@ -954,6 +954,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
|
||||
priv = hw->priv;
|
||||
priv->hw = hw;
|
||||
priv->usb = udev;
|
||||
priv->intf = intf;
|
||||
|
||||
vnt_set_options(priv);
|
||||
|
||||
|
||||
@ -109,6 +109,7 @@ void vnt_run_command(struct work_struct *work)
|
||||
if (vnt_init(priv)) {
|
||||
/* If fail all ends TODO retry */
|
||||
dev_err(&priv->usb->dev, "failed to start\n");
|
||||
usb_set_intfdata(priv->intf, NULL);
|
||||
ieee80211_free_hw(priv->hw);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -2810,6 +2810,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
|
||||
if (uport->cons && uport->dev)
|
||||
of_console_check(uport->dev->of_node, uport->cons->name, uport->line);
|
||||
|
||||
tty_port_link_device(port, drv->tty_driver, uport->line);
|
||||
uart_configure_port(drv, state, uport);
|
||||
|
||||
port->console = uart_console(uport);
|
||||
|
||||
@ -37,6 +37,7 @@ static int (*orig_bus_suspend)(struct usb_hcd *hcd);
|
||||
|
||||
struct ehci_ci_priv {
|
||||
struct regulator *reg_vbus;
|
||||
bool enabled;
|
||||
};
|
||||
|
||||
static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
|
||||
@ -48,7 +49,7 @@ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
|
||||
int ret = 0;
|
||||
int port = HCS_N_PORTS(ehci->hcs_params);
|
||||
|
||||
if (priv->reg_vbus) {
|
||||
if (priv->reg_vbus && enable != priv->enabled) {
|
||||
if (port > 1) {
|
||||
dev_warn(dev,
|
||||
"Not support multi-port regulator control\n");
|
||||
@ -64,6 +65,7 @@ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
|
||||
enable ? "enable" : "disable", ret);
|
||||
return ret;
|
||||
}
|
||||
priv->enabled = enable;
|
||||
}
|
||||
|
||||
if (enable && (ci->platdata->phy_mode == USBPHY_INTERFACE_MODE_HSIC)) {
|
||||
|
||||
@ -392,12 +392,16 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,
|
||||
endpoint->desc.wMaxPacketSize = cpu_to_le16(8);
|
||||
}
|
||||
|
||||
/* Validate the wMaxPacketSize field */
|
||||
/*
|
||||
* Validate the wMaxPacketSize field.
|
||||
* Some devices have isochronous endpoints in altsetting 0;
|
||||
* the USB-2 spec requires such endpoints to have wMaxPacketSize = 0
|
||||
* (see the end of section 5.6.3), so don't warn about them.
|
||||
*/
|
||||
maxp = usb_endpoint_maxp(&endpoint->desc);
|
||||
if (maxp == 0) {
|
||||
dev_warn(ddev, "config %d interface %d altsetting %d endpoint 0x%X has wMaxPacketSize 0, skipping\n",
|
||||
if (maxp == 0 && !(usb_endpoint_xfer_isoc(d) && asnum == 0)) {
|
||||
dev_warn(ddev, "config %d interface %d altsetting %d endpoint 0x%X has invalid wMaxPacketSize 0\n",
|
||||
cfgno, inum, asnum, d->bEndpointAddress);
|
||||
goto skip_to_next_endpoint_or_interface_descriptor;
|
||||
}
|
||||
|
||||
/* Find the highest legal maxpacket size for this endpoint */
|
||||
|
||||
@ -1838,6 +1838,9 @@ static const struct attribute_group musb_attr_group = {
|
||||
#define MUSB_QUIRK_B_INVALID_VBUS_91 (MUSB_DEVCTL_BDEVICE | \
|
||||
(2 << MUSB_DEVCTL_VBUS_SHIFT) | \
|
||||
MUSB_DEVCTL_SESSION)
|
||||
#define MUSB_QUIRK_B_DISCONNECT_99 (MUSB_DEVCTL_BDEVICE | \
|
||||
(3 << MUSB_DEVCTL_VBUS_SHIFT) | \
|
||||
MUSB_DEVCTL_SESSION)
|
||||
#define MUSB_QUIRK_A_DISCONNECT_19 ((3 << MUSB_DEVCTL_VBUS_SHIFT) | \
|
||||
MUSB_DEVCTL_SESSION)
|
||||
|
||||
@ -1860,6 +1863,11 @@ static void musb_pm_runtime_check_session(struct musb *musb)
|
||||
s = MUSB_DEVCTL_FSDEV | MUSB_DEVCTL_LSDEV |
|
||||
MUSB_DEVCTL_HR;
|
||||
switch (devctl & ~s) {
|
||||
case MUSB_QUIRK_B_DISCONNECT_99:
|
||||
musb_dbg(musb, "Poll devctl in case of suspend after disconnect\n");
|
||||
schedule_delayed_work(&musb->irq_work,
|
||||
msecs_to_jiffies(1000));
|
||||
break;
|
||||
case MUSB_QUIRK_B_INVALID_VBUS_91:
|
||||
if (musb->quirk_retries && !musb->flush_irq_work) {
|
||||
musb_dbg(musb,
|
||||
@ -2320,6 +2328,9 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
|
||||
musb_disable_interrupts(musb);
|
||||
musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
|
||||
|
||||
/* MUSB_POWER_SOFTCONN might be already set, JZ4740 does this. */
|
||||
musb_writeb(musb->mregs, MUSB_POWER, 0);
|
||||
|
||||
/* Init IRQ workqueue before request_irq */
|
||||
INIT_DELAYED_WORK(&musb->irq_work, musb_irq_work);
|
||||
INIT_DELAYED_WORK(&musb->deassert_reset_work, musb_deassert_reset);
|
||||
|
||||
@ -399,7 +399,7 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb,
|
||||
controller->controller.channel_abort = dma_channel_abort;
|
||||
|
||||
if (request_irq(irq, dma_controller_irq, 0,
|
||||
dev_name(musb->controller), &controller->controller)) {
|
||||
dev_name(musb->controller), controller)) {
|
||||
dev_err(dev, "request_irq %d failed!\n", irq);
|
||||
musb_dma_controller_destroy(&controller->controller);
|
||||
|
||||
|
||||
@ -570,6 +570,9 @@ static void option_instat_callback(struct urb *urb);
|
||||
/* Interface must have two endpoints */
|
||||
#define NUMEP2 BIT(16)
|
||||
|
||||
/* Device needs ZLP */
|
||||
#define ZLP BIT(17)
|
||||
|
||||
|
||||
static const struct usb_device_id option_ids[] = {
|
||||
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
|
||||
@ -1201,6 +1204,8 @@ static const struct usb_device_id option_ids[] = {
|
||||
.driver_info = NCTRL(0) | RSVD(1) },
|
||||
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */
|
||||
.driver_info = NCTRL(0) },
|
||||
{ USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */
|
||||
.driver_info = NCTRL(0) | ZLP },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
|
||||
.driver_info = RSVD(1) },
|
||||
@ -2109,6 +2114,9 @@ static int option_attach(struct usb_serial *serial)
|
||||
if (!(device_flags & NCTRL(iface_desc->bInterfaceNumber)))
|
||||
data->use_send_setup = 1;
|
||||
|
||||
if (device_flags & ZLP)
|
||||
data->use_zlp = 1;
|
||||
|
||||
spin_lock_init(&data->susp_lock);
|
||||
|
||||
usb_set_serial_data(serial, data);
|
||||
|
||||
@ -36,6 +36,7 @@ struct usb_wwan_intf_private {
|
||||
spinlock_t susp_lock;
|
||||
unsigned int suspended:1;
|
||||
unsigned int use_send_setup:1;
|
||||
unsigned int use_zlp:1;
|
||||
int in_flight;
|
||||
unsigned int open_ports;
|
||||
void *private;
|
||||
|
||||
@ -492,6 +492,7 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial_port *port,
|
||||
void (*callback) (struct urb *))
|
||||
{
|
||||
struct usb_serial *serial = port->serial;
|
||||
struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
|
||||
struct urb *urb;
|
||||
|
||||
urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */
|
||||
@ -502,6 +503,9 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial_port *port,
|
||||
usb_sndbulkpipe(serial->dev, endpoint) | dir,
|
||||
buf, len, callback, ctx);
|
||||
|
||||
if (intfdata->use_zlp && dir == USB_DIR_OUT)
|
||||
urb->transfer_flags |= URB_ZERO_PACKET;
|
||||
|
||||
return urb;
|
||||
}
|
||||
|
||||
|
||||
@ -361,7 +361,7 @@ static struct kobject *cdev_get(struct cdev *p)
|
||||
|
||||
if (owner && !try_module_get(owner))
|
||||
return NULL;
|
||||
kobj = kobject_get(&p->kobj);
|
||||
kobj = kobject_get_unless_zero(&p->kobj);
|
||||
if (!kobj)
|
||||
module_put(owner);
|
||||
return kobj;
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
#include <linux/can/error.h>
|
||||
#include <linux/can/led.h>
|
||||
#include <linux/can/netlink.h>
|
||||
#include <linux/can/skb.h>
|
||||
#include <linux/netdevice.h>
|
||||
|
||||
/*
|
||||
@ -90,6 +91,36 @@ struct can_priv {
|
||||
#define get_can_dlc(i) (min_t(__u8, (i), CAN_MAX_DLC))
|
||||
#define get_canfd_dlc(i) (min_t(__u8, (i), CANFD_MAX_DLC))
|
||||
|
||||
/* Check for outgoing skbs that have not been created by the CAN subsystem */
|
||||
static inline bool can_skb_headroom_valid(struct net_device *dev,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
/* af_packet creates a headroom of HH_DATA_MOD bytes which is fine */
|
||||
if (WARN_ON_ONCE(skb_headroom(skb) < sizeof(struct can_skb_priv)))
|
||||
return false;
|
||||
|
||||
/* af_packet does not apply CAN skb specific settings */
|
||||
if (skb->ip_summed == CHECKSUM_NONE) {
|
||||
/* init headroom */
|
||||
can_skb_prv(skb)->ifindex = dev->ifindex;
|
||||
can_skb_prv(skb)->skbcnt = 0;
|
||||
|
||||
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
||||
|
||||
/* preform proper loopback on capable devices */
|
||||
if (dev->flags & IFF_ECHO)
|
||||
skb->pkt_type = PACKET_LOOPBACK;
|
||||
else
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
||||
skb_reset_mac_header(skb);
|
||||
skb_reset_network_header(skb);
|
||||
skb_reset_transport_header(skb);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Drop a given socketbuffer if it does not contain a valid CAN frame. */
|
||||
static inline bool can_dropped_invalid_skb(struct net_device *dev,
|
||||
struct sk_buff *skb)
|
||||
@ -107,6 +138,9 @@ static inline bool can_dropped_invalid_skb(struct net_device *dev,
|
||||
} else
|
||||
goto inval_skb;
|
||||
|
||||
if (!can_skb_headroom_valid(dev, skb))
|
||||
goto inval_skb;
|
||||
|
||||
return false;
|
||||
|
||||
inval_skb:
|
||||
|
||||
@ -640,7 +640,7 @@ static void start_wakeup_tracer(struct trace_array *tr)
|
||||
if (ret) {
|
||||
pr_info("wakeup trace: Couldn't activate tracepoint"
|
||||
" probe to kernel_sched_migrate_task\n");
|
||||
return;
|
||||
goto fail_deprobe_sched_switch;
|
||||
}
|
||||
|
||||
wakeup_reset(tr);
|
||||
@ -658,6 +658,8 @@ static void start_wakeup_tracer(struct trace_array *tr)
|
||||
printk(KERN_ERR "failed to start wakeup tracer\n");
|
||||
|
||||
return;
|
||||
fail_deprobe_sched_switch:
|
||||
unregister_trace_sched_switch(probe_wakeup_sched_switch, NULL);
|
||||
fail_deprobe_wake_new:
|
||||
unregister_trace_sched_wakeup_new(probe_wakeup, NULL);
|
||||
fail_deprobe:
|
||||
|
||||
@ -196,6 +196,11 @@ check_stack(unsigned long ip, unsigned long *stack)
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
||||
/* Some archs may not define MCOUNT_INSN_SIZE */
|
||||
#ifndef MCOUNT_INSN_SIZE
|
||||
# define MCOUNT_INSN_SIZE 0
|
||||
#endif
|
||||
|
||||
static void
|
||||
stack_trace_call(unsigned long ip, unsigned long parent_ip,
|
||||
struct ftrace_ops *op, struct pt_regs *pt_regs)
|
||||
|
||||
@ -394,10 +394,11 @@ next: ;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static inline int check_target(struct arpt_entry *e, const char *name)
|
||||
static int check_target(struct arpt_entry *e, struct net *net, const char *name)
|
||||
{
|
||||
struct xt_entry_target *t = arpt_get_target(e);
|
||||
struct xt_tgchk_param par = {
|
||||
.net = net,
|
||||
.table = name,
|
||||
.entryinfo = e,
|
||||
.target = t->u.kernel.target,
|
||||
@ -409,8 +410,9 @@ static inline int check_target(struct arpt_entry *e, const char *name)
|
||||
return xt_check_target(&par, t->u.target_size - sizeof(*t), 0, false);
|
||||
}
|
||||
|
||||
static inline int
|
||||
find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,
|
||||
static int
|
||||
find_check_entry(struct arpt_entry *e, struct net *net, const char *name,
|
||||
unsigned int size,
|
||||
struct xt_percpu_counter_alloc_state *alloc_state)
|
||||
{
|
||||
struct xt_entry_target *t;
|
||||
@ -429,7 +431,7 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,
|
||||
}
|
||||
t->u.kernel.target = target;
|
||||
|
||||
ret = check_target(e, name);
|
||||
ret = check_target(e, net, name);
|
||||
if (ret)
|
||||
goto err;
|
||||
return 0;
|
||||
@ -522,7 +524,9 @@ static inline void cleanup_entry(struct arpt_entry *e)
|
||||
/* Checks and translates the user-supplied table segment (held in
|
||||
* newinfo).
|
||||
*/
|
||||
static int translate_table(struct xt_table_info *newinfo, void *entry0,
|
||||
static int translate_table(struct net *net,
|
||||
struct xt_table_info *newinfo,
|
||||
void *entry0,
|
||||
const struct arpt_replace *repl)
|
||||
{
|
||||
struct xt_percpu_counter_alloc_state alloc_state = { 0 };
|
||||
@ -586,7 +590,7 @@ static int translate_table(struct xt_table_info *newinfo, void *entry0,
|
||||
/* Finally, each sanity check must pass */
|
||||
i = 0;
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
ret = find_check_entry(iter, repl->name, repl->size,
|
||||
ret = find_check_entry(iter, net, repl->name, repl->size,
|
||||
&alloc_state);
|
||||
if (ret != 0)
|
||||
break;
|
||||
@ -974,7 +978,7 @@ static int do_replace(struct net *net, const void __user *user,
|
||||
goto free_newinfo;
|
||||
}
|
||||
|
||||
ret = translate_table(newinfo, loc_cpu_entry, &tmp);
|
||||
ret = translate_table(net, newinfo, loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
@ -1149,7 +1153,8 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
||||
}
|
||||
}
|
||||
|
||||
static int translate_compat_table(struct xt_table_info **pinfo,
|
||||
static int translate_compat_table(struct net *net,
|
||||
struct xt_table_info **pinfo,
|
||||
void **pentry0,
|
||||
const struct compat_arpt_replace *compatr)
|
||||
{
|
||||
@ -1217,7 +1222,7 @@ static int translate_compat_table(struct xt_table_info **pinfo,
|
||||
repl.num_counters = 0;
|
||||
repl.counters = NULL;
|
||||
repl.size = newinfo->size;
|
||||
ret = translate_table(newinfo, entry1, &repl);
|
||||
ret = translate_table(net, newinfo, entry1, &repl);
|
||||
if (ret)
|
||||
goto free_newinfo;
|
||||
|
||||
@ -1270,7 +1275,7 @@ static int compat_do_replace(struct net *net, void __user *user,
|
||||
goto free_newinfo;
|
||||
}
|
||||
|
||||
ret = translate_compat_table(&newinfo, &loc_cpu_entry, &tmp);
|
||||
ret = translate_compat_table(net, &newinfo, &loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
@ -1546,7 +1551,7 @@ int arpt_register_table(struct net *net,
|
||||
loc_cpu_entry = newinfo->entries;
|
||||
memcpy(loc_cpu_entry, repl->entries, repl->size);
|
||||
|
||||
ret = translate_table(newinfo, loc_cpu_entry, repl);
|
||||
ret = translate_table(net, newinfo, loc_cpu_entry, repl);
|
||||
if (ret != 0)
|
||||
goto out_free;
|
||||
|
||||
|
||||
@ -1639,6 +1639,7 @@ static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,
|
||||
struct ip_set *set;
|
||||
struct nlattr *tb[IPSET_ATTR_ADT_MAX + 1] = {};
|
||||
int ret = 0;
|
||||
u32 lineno;
|
||||
|
||||
if (unlikely(protocol_failed(attr) ||
|
||||
!attr[IPSET_ATTR_SETNAME] ||
|
||||
@ -1655,7 +1656,7 @@ static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,
|
||||
return -IPSET_ERR_PROTOCOL;
|
||||
|
||||
rcu_read_lock_bh();
|
||||
ret = set->variant->uadt(set, tb, IPSET_TEST, NULL, 0, 0);
|
||||
ret = set->variant->uadt(set, tb, IPSET_TEST, &lineno, 0, 0);
|
||||
rcu_read_unlock_bh();
|
||||
/* Userspace can't trigger element to be re-added */
|
||||
if (ret == -EAGAIN)
|
||||
|
||||
@ -378,6 +378,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
|
||||
case 0x10ec0672:
|
||||
alc_update_coef_idx(codec, 0xd, 0, 1<<14); /* EAPD Ctrl */
|
||||
break;
|
||||
case 0x10ec0222:
|
||||
case 0x10ec0623:
|
||||
alc_update_coef_idx(codec, 0x19, 1<<13, 0);
|
||||
break;
|
||||
@ -396,6 +397,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
|
||||
break;
|
||||
case 0x10ec0899:
|
||||
case 0x10ec0900:
|
||||
case 0x10ec0b00:
|
||||
case 0x10ec1168:
|
||||
case 0x10ec1220:
|
||||
alc_update_coef_idx(codec, 0x7, 1<<1, 0);
|
||||
@ -2389,6 +2391,7 @@ static int patch_alc882(struct hda_codec *codec)
|
||||
case 0x10ec0882:
|
||||
case 0x10ec0885:
|
||||
case 0x10ec0900:
|
||||
case 0x10ec0b00:
|
||||
case 0x10ec1220:
|
||||
break;
|
||||
default:
|
||||
@ -8398,6 +8401,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
|
||||
HDA_CODEC_ENTRY(0x10ec0892, "ALC892", patch_alc662),
|
||||
HDA_CODEC_ENTRY(0x10ec0899, "ALC898", patch_alc882),
|
||||
HDA_CODEC_ENTRY(0x10ec0900, "ALC1150", patch_alc882),
|
||||
HDA_CODEC_ENTRY(0x10ec0b00, "ALCS1200A", patch_alc882),
|
||||
HDA_CODEC_ENTRY(0x10ec1168, "ALC1220", patch_alc882),
|
||||
HDA_CODEC_ENTRY(0x10ec1220, "ALC1220", patch_alc882),
|
||||
{} /* terminator */
|
||||
|
||||
@ -1143,6 +1143,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
|
||||
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
|
||||
case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */
|
||||
case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */
|
||||
case USB_ID(0x05a7, 0x1020): /* Bose Companion 5 */
|
||||
case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
|
||||
case USB_ID(0x1395, 0x740a): /* Sennheiser DECT */
|
||||
case USB_ID(0x1901, 0x0191): /* GE B850V3 CP2114 audio interface */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user