asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This is the 4.19.303 stable release

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmWC/FIACgkQONu9yGCS
 aT4PGBAAmX42BpkC8qqWMrV0bmHf7KtjUyPBeMybVKBXaFkhUSbtwraAI0QWkIUM
 mEqzUehaTxFhy+QFGRvA9982ChamygDZsWK+2EOigqTXFmVWrIESC5GJAHrCdc06
 /b+6oNoTFuRcbVIAxyEL9S+K1pJ11/6Da6tvUKiWizczpZnA3IXLT4nbTFr3Q7cS
 wPv6ggk6rdyXlmMSiYrRJA4HjN/0akrUNcwoW00LCgKc8892Y7Q1YfnFiJVC75Fa
 U2+97SSvboM6pJ28mvm3yR4dV02Q8Cs9hI9M1rzIV6ftU8KzEUP3ZCZGaUh4Bwqi
 MOH8T5DaE+Velbp7ECyzQRHOzhu1dGjFOda1ZR9YpbcE/PBzZ4fOSIUf1glP3K6o
 U9FpIJHMn+MQk1j4AA+GYJfhOAeaiBjs5y7z3hhNLV1lvshuZGxRKONUtBtOMhwS
 HfYBW3/7Af7a2q2ITS27RRBCFv6Gqkza0vLzte0Om0XvCn6JFzzIsymFa0cjjg2B
 G++HZDBQqHWF8EEYRA1XsoJQDEk9o2F7IaX+hOar24mAEsqXBYNzOFvqn2uf/a5c
 9mGBpbDGrq0P5EkwIQjgSovbvmplmmAGB74fBrCSrQVKuXjzloAjUbHQqFVVu49q
 lAMTCtfLxQyioSlTXrYKX1ANKjlR1kqBIF2GP2oHE74MwR3hYSo=
 =V5/I
 -----END PGP SIGNATURE-----

Merge 4.19.303 into android-4.19-stable

Changes in 4.19.303
	qca_debug: Prevent crash on TX ring changes
	qca_debug: Fix ethtool -G iface tx behavior
	qca_spi: Fix reset behavior
	atm: solos-pci: Fix potential deadlock on &cli_queue_lock
	atm: solos-pci: Fix potential deadlock on &tx_queue_lock
	atm: Fix Use-After-Free in do_vcc_ioctl
	net/rose: Fix Use-After-Free in rose_ioctl
	qed: Fix a potential use-after-free in qed_cxt_tables_alloc
	net: Remove acked SYN flag from packet in the transmit queue correctly
	sign-file: Fix incorrect return values check
	vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space()
	net: stmmac: Handle disabled MDIO busses from devicetree
	appletalk: Fix Use-After-Free in atalk_ioctl
	Revert "PCI: acpiphp: Reassign resources on bridge if necessary"
	cred: switch to using atomic_long_t
	blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!"
	bcache: avoid oversize memory allocation by small stripe_size
	bcache: add code comments for bch_btree_node_get() and __bch_btree_node_alloc()
	bcache: avoid NULL checking to c->root in run_cache_set()
	platform/x86: intel_telemetry: Fix kernel doc descriptions
	HID: add ALWAYS_POLL quirk for Apple kb
	HID: hid-asus: reset the backlight brightness level on resume
	HID: multitouch: Add quirk for HONOR GLO-GXXX touchpad
	asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation
	net: usb: qmi_wwan: claim interface 4 for ZTE MF290
	HID: hid-asus: add const to read-only outgoing usb buffer
	perf: Fix perf_event_validate_size() lockdep splat
	ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS
	arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify
	team: Fix use-after-free when an option instance allocation fails
	ring-buffer: Fix memory leak of free page
	mmc: block: Be sure to wait while busy in CQE error recovery
	powerpc/ftrace: Create a dummy stackframe to fix stack unwind
	powerpc/ftrace: Fix stack teardown in ftrace_no_trace
	Linux 4.19.303

Change-Id: I209240976b6ff49ae89b0a77e777041e376416d9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-12-21 12:12:36 +00:00
commit db2162fa05
33 changed files with 183 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 4 VERSION = 4
PATCHLEVEL = 19 PATCHLEVEL = 19
SUBLEVEL = 302 SUBLEVEL = 303
EXTRAVERSION = EXTRAVERSION =
NAME = "People's Front" NAME = "People's Front"

6
arch/arm64/include/asm/pgtable.h
View file

@ -595,6 +595,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
if (pte_hw_dirty(pte)) if (pte_hw_dirty(pte))
pte = pte_mkdirty(pte); pte = pte_mkdirty(pte);
pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask); pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
/*
* If we end up clearing hw dirtiness for a sw-dirty PTE, set hardware
* dirtiness again.
*/
if (pte_sw_dirty(pte))
pte = pte_mkdirty(pte);
return pte; return pte;
} }

17
arch/powerpc/kernel/trace/ftrace_64_mprofile.S
View file

@ -40,6 +40,9 @@ _GLOBAL(ftrace_regs_caller)
/* Save the original return address in A's stack frame */ /* Save the original return address in A's stack frame */
std r0,LRSAVE(r1) std r0,LRSAVE(r1)
/* Create a minimal stack frame for representing B */
stdu r1, -STACK_FRAME_MIN_SIZE(r1)
/* Create our stack frame + pt_regs */ /* Create our stack frame + pt_regs */
stdu r1,-SWITCH_FRAME_SIZE(r1) stdu r1,-SWITCH_FRAME_SIZE(r1)
@ -56,7 +59,7 @@ _GLOBAL(ftrace_regs_caller)
SAVE_10GPRS(22, r1) SAVE_10GPRS(22, r1)
/* Save previous stack pointer (r1) */ /* Save previous stack pointer (r1) */
addi r8, r1, SWITCH_FRAME_SIZE addi r8, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
std r8, GPR1(r1) std r8, GPR1(r1)
/* Load special regs for save below */ /* Load special regs for save below */
@ -69,6 +72,8 @@ _GLOBAL(ftrace_regs_caller)
mflr r7 mflr r7
/* Save it as pt_regs->nip */ /* Save it as pt_regs->nip */
std r7, _NIP(r1) std r7, _NIP(r1)
/* Also save it in B's stackframe header for proper unwind */
std r7, LRSAVE+SWITCH_FRAME_SIZE(r1)
/* Save the read LR in pt_regs->link */ /* Save the read LR in pt_regs->link */
std r0, _LINK(r1) std r0, _LINK(r1)
@ -125,7 +130,7 @@ ftrace_regs_call:
ld r2, 24(r1) ld r2, 24(r1)
/* Pop our stack frame */ /* Pop our stack frame */
addi r1, r1, SWITCH_FRAME_SIZE addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
#ifdef CONFIG_LIVEPATCH #ifdef CONFIG_LIVEPATCH
/* Based on the cmpd above, if the NIP was altered handle livepatch */ /* Based on the cmpd above, if the NIP was altered handle livepatch */
@ -149,7 +154,7 @@ ftrace_no_trace:
mflr r3 mflr r3
mtctr r3 mtctr r3
REST_GPR(3, r1) REST_GPR(3, r1)
addi r1, r1, SWITCH_FRAME_SIZE addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
mtlr r0 mtlr r0
bctr bctr
@ -157,6 +162,9 @@ _GLOBAL(ftrace_caller)
/* Save the original return address in A's stack frame */ /* Save the original return address in A's stack frame */
std r0, LRSAVE(r1) std r0, LRSAVE(r1)
/* Create a minimal stack frame for representing B */
stdu r1, -STACK_FRAME_MIN_SIZE(r1)
/* Create our stack frame + pt_regs */ /* Create our stack frame + pt_regs */
stdu r1, -SWITCH_FRAME_SIZE(r1) stdu r1, -SWITCH_FRAME_SIZE(r1)
@ -170,6 +178,7 @@ _GLOBAL(ftrace_caller)
/* Get the _mcount() call site out of LR */ /* Get the _mcount() call site out of LR */
mflr r7 mflr r7
std r7, _NIP(r1) std r7, _NIP(r1)
std r7, LRSAVE+SWITCH_FRAME_SIZE(r1)
/* Save callee's TOC in the ABI compliant location */ /* Save callee's TOC in the ABI compliant location */
std r2, 24(r1) std r2, 24(r1)
@ -204,7 +213,7 @@ ftrace_call:
ld r2, 24(r1) ld r2, 24(r1)
/* Pop our stack frame */ /* Pop our stack frame */
addi r1, r1, SWITCH_FRAME_SIZE addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
/* Reload original LR */ /* Reload original LR */
ld r0, LRSAVE(r1) ld r0, LRSAVE(r1)

2
block/blk-throttle.c
View file

@ -1383,6 +1383,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global)
tg_bps_limit(tg, READ), tg_bps_limit(tg, WRITE), tg_bps_limit(tg, READ), tg_bps_limit(tg, WRITE),
tg_iops_limit(tg, READ), tg_iops_limit(tg, WRITE)); tg_iops_limit(tg, READ), tg_iops_limit(tg, WRITE));
rcu_read_lock();
/* /*
* Update has_rules[] flags for the updated tg's subtree. A tg is * Update has_rules[] flags for the updated tg's subtree. A tg is
* considered to have rules if either the tg itself or any of its * considered to have rules if either the tg itself or any of its
@ -1410,6 +1411,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global)
this_tg->latency_target = max(this_tg->latency_target, this_tg->latency_target = max(this_tg->latency_target,
parent_tg->latency_target); parent_tg->latency_target);
} }
rcu_read_unlock();
/* /*
* We're already holding queue_lock and know @tg is valid. Let's * We're already holding queue_lock and know @tg is valid. Let's

8
drivers/atm/solos-pci.c
View file

@ -458,9 +458,9 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr,
struct sk_buff *skb; struct sk_buff *skb;
unsigned int len; unsigned int len;
spin_lock(&card->cli_queue_lock); spin_lock_bh(&card->cli_queue_lock);
skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]); skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]);
spin_unlock(&card->cli_queue_lock); spin_unlock_bh(&card->cli_queue_lock);
if(skb == NULL) if(skb == NULL)
return sprintf(buf, "No data.\n"); return sprintf(buf, "No data.\n");
@ -968,14 +968,14 @@ static void pclose(struct atm_vcc *vcc)
struct pkt_hdr *header; struct pkt_hdr *header;
/* Remove any yet-to-be-transmitted packets from the pending queue */ /* Remove any yet-to-be-transmitted packets from the pending queue */
spin_lock(&card->tx_queue_lock); spin_lock_bh(&card->tx_queue_lock);
skb_queue_walk_safe(&card->tx_queue[port], skb, tmpskb) { skb_queue_walk_safe(&card->tx_queue[port], skb, tmpskb) {
if (SKB_CB(skb)->vcc == vcc) { if (SKB_CB(skb)->vcc == vcc) {
skb_unlink(skb, &card->tx_queue[port]); skb_unlink(skb, &card->tx_queue[port]);
solos_pop(vcc, skb); solos_pop(vcc, skb);
} }
} }
spin_unlock(&card->tx_queue_lock); spin_unlock_bh(&card->tx_queue_lock);
skb = alloc_skb(sizeof(*header), GFP_KERNEL); skb = alloc_skb(sizeof(*header), GFP_KERNEL);
if (!skb) { if (!skb) {

25
drivers/hid/hid-asus.c
View file

@ -252,7 +252,7 @@ static int asus_raw_event(struct hid_device *hdev,
return 0; return 0;
} }
static int asus_kbd_set_report(struct hid_device *hdev, u8 *buf, size_t buf_size) static int asus_kbd_set_report(struct hid_device *hdev, const u8 *buf, size_t buf_size)
{ {
unsigned char *dmabuf; unsigned char *dmabuf;
int ret; int ret;
@ -271,7 +271,7 @@ static int asus_kbd_set_report(struct hid_device *hdev, u8 *buf, size_t buf_size
static int asus_kbd_init(struct hid_device *hdev) static int asus_kbd_init(struct hid_device *hdev)
{ {
u8 buf[] = { FEATURE_KBD_REPORT_ID, 0x41, 0x53, 0x55, 0x53, 0x20, 0x54, const u8 buf[] = { FEATURE_KBD_REPORT_ID, 0x41, 0x53, 0x55, 0x53, 0x20, 0x54,
0x65, 0x63, 0x68, 0x2e, 0x49, 0x6e, 0x63, 0x2e, 0x00 }; 0x65, 0x63, 0x68, 0x2e, 0x49, 0x6e, 0x63, 0x2e, 0x00 };
int ret; int ret;
@ -285,7 +285,7 @@ static int asus_kbd_init(struct hid_device *hdev)
static int asus_kbd_get_functions(struct hid_device *hdev, static int asus_kbd_get_functions(struct hid_device *hdev,
unsigned char *kbd_func) unsigned char *kbd_func)
{ {
u8 buf[] = { FEATURE_KBD_REPORT_ID, 0x05, 0x20, 0x31, 0x00, 0x08 }; const u8 buf[] = { FEATURE_KBD_REPORT_ID, 0x05, 0x20, 0x31, 0x00, 0x08 };
u8 *readbuf; u8 *readbuf;
int ret; int ret;
@ -614,6 +614,24 @@ static int asus_start_multitouch(struct hid_device *hdev)
return 0; return 0;
} }
static int __maybe_unused asus_resume(struct hid_device *hdev) {
struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
int ret = 0;
if (drvdata->kbd_backlight) {
const u8 buf[] = { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4,
drvdata->kbd_backlight->cdev.brightness };
ret = asus_kbd_set_report(hdev, buf, sizeof(buf));
if (ret < 0) {
hid_err(hdev, "Asus failed to set keyboard backlight: %d\n", ret);
goto asus_resume_err;
}
}
asus_resume_err:
return ret;
}
static int __maybe_unused asus_reset_resume(struct hid_device *hdev) static int __maybe_unused asus_reset_resume(struct hid_device *hdev)
{ {
struct asus_drvdata *drvdata = hid_get_drvdata(hdev); struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
@ -831,6 +849,7 @@ static struct hid_driver asus_driver = {
.input_configured = asus_input_configured, .input_configured = asus_input_configured,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.reset_resume = asus_reset_resume, .reset_resume = asus_reset_resume,
.resume = asus_resume,
#endif #endif
.raw_event = asus_raw_event .raw_event = asus_raw_event
}; };

5
drivers/hid/hid-multitouch.c
View file

@ -1981,6 +1981,11 @@ static const struct hid_device_id mt_devices[] = {
MT_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT, MT_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT,
USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) }, USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) },
/* HONOR GLO-GXXX panel */
{ .driver_data = MT_CLS_VTL,
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
0x347d, 0x7853) },
/* Ilitek dual touch panel */ /* Ilitek dual touch panel */
{ .driver_data = MT_CLS_NSMU, { .driver_data = MT_CLS_NSMU,
MT_USB_DEVICE(USB_VENDOR_ID_ILITEK, MT_USB_DEVICE(USB_VENDOR_ID_ILITEK,

1
drivers/hid/hid-quirks.c
View file

@ -35,6 +35,7 @@ static const struct hid_device_id hid_quirks[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_AKAI, USB_DEVICE_ID_AKAI_MPKMINI2), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_AKAI, USB_DEVICE_ID_AKAI_MPKMINI2), HID_QUIRK_NO_INIT_REPORTS },
{ HID_USB_DEVICE(USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD), HID_QUIRK_BADPAD }, { HID_USB_DEVICE(USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD), HID_QUIRK_BADPAD },
{ HID_USB_DEVICE(USB_VENDOR_ID_AMI, USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_AMI, USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE), HID_QUIRK_ALWAYS_POLL },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI), HID_QUIRK_ALWAYS_POLL },
{ HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM), HID_QUIRK_NOGET },
{ HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC), HID_QUIRK_NOGET },
{ HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM), HID_QUIRK_NOGET },

1
drivers/md/bcache/bcache.h
View file

@ -265,6 +265,7 @@ struct bcache_device {
#define BCACHE_DEV_WB_RUNNING 3 #define BCACHE_DEV_WB_RUNNING 3
#define BCACHE_DEV_RATE_DW_RUNNING 4 #define BCACHE_DEV_RATE_DW_RUNNING 4
int nr_stripes; int nr_stripes;
#define BCH_MIN_STRIPE_SZ ((4 << 20) >> SECTOR_SHIFT)
unsigned int stripe_size; unsigned int stripe_size;
atomic_t *stripe_sectors_dirty; atomic_t *stripe_sectors_dirty;
unsigned long *full_dirty_stripes; unsigned long *full_dirty_stripes;

7
drivers/md/bcache/btree.c
View file

@ -1008,6 +1008,9 @@ err:
* *
* The btree node will have either a read or a write lock held, depending on * The btree node will have either a read or a write lock held, depending on
* level and op->lock. * level and op->lock.
*
* Note: Only error code or btree pointer will be returned, it is unncessary
* for callers to check NULL pointer.
*/ */
struct btree *bch_btree_node_get(struct cache_set *c, struct btree_op *op, struct btree *bch_btree_node_get(struct cache_set *c, struct btree_op *op,
struct bkey *k, int level, bool write, struct bkey *k, int level, bool write,
@ -1120,6 +1123,10 @@ retry:
mutex_unlock(&b->c->bucket_lock); mutex_unlock(&b->c->bucket_lock);
} }
/*
* Only error code or btree pointer will be returned, it is unncessary for
* callers to check NULL pointer.
*/
struct btree *__bch_btree_node_alloc(struct cache_set *c, struct btree_op *op, struct btree *__bch_btree_node_alloc(struct cache_set *c, struct btree_op *op,
int level, bool wait, int level, bool wait,
struct btree *parent) struct btree *parent)

4
drivers/md/bcache/super.c
View file

@ -807,6 +807,8 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size,
if (!d->stripe_size) if (!d->stripe_size)
d->stripe_size = 1 << 31; d->stripe_size = 1 << 31;
else if (d->stripe_size < BCH_MIN_STRIPE_SZ)
d->stripe_size = roundup(BCH_MIN_STRIPE_SZ, d->stripe_size);
d->nr_stripes = DIV_ROUND_UP_ULL(sectors, d->stripe_size); d->nr_stripes = DIV_ROUND_UP_ULL(sectors, d->stripe_size);
@ -1844,7 +1846,7 @@ static int run_cache_set(struct cache_set *c)
c->root = bch_btree_node_get(c, NULL, k, c->root = bch_btree_node_get(c, NULL, k,
j->btree_level, j->btree_level,
true, NULL); true, NULL);
if (IS_ERR_OR_NULL(c->root)) if (IS_ERR(c->root))
goto err; goto err;
list_del_init(&c->root->list); list_del_init(&c->root->list);

2
drivers/mmc/core/core.c
View file

@ -573,6 +573,8 @@ int mmc_cqe_recovery(struct mmc_host *host)
cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT; cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;
mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES); mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
mmc_poll_for_busy(host->card, MMC_CQE_RECOVERY_TIMEOUT, true, true);
memset(&cmd, 0, sizeof(cmd)); memset(&cmd, 0, sizeof(cmd));
cmd.opcode = MMC_CMDQ_TASK_MGMT; cmd.opcode = MMC_CMDQ_TASK_MGMT;
cmd.arg = 1; /* Discard entire queue */ cmd.arg = 1; /* Discard entire queue */

5
drivers/mmc/core/mmc_ops.c
View file

@ -448,8 +448,8 @@ int mmc_switch_status(struct mmc_card *card)
return __mmc_switch_status(card, true); return __mmc_switch_status(card, true);
} }
static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
bool send_status, bool retry_crc_err) bool send_status, bool retry_crc_err)
{ {
struct mmc_host *host = card->host; struct mmc_host *host = card->host;
int err; int err;
@ -502,6 +502,7 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(mmc_poll_for_busy);
/** /**
* __mmc_switch - modify EXT_CSD register * __mmc_switch - modify EXT_CSD register

2
drivers/mmc/core/mmc_ops.h
View file

@ -35,6 +35,8 @@ int mmc_can_ext_csd(struct mmc_card *card);
int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd); int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);
int mmc_switch_status(struct mmc_card *card); int mmc_switch_status(struct mmc_card *card);
int __mmc_switch_status(struct mmc_card *card, bool crc_err_fatal); int __mmc_switch_status(struct mmc_card *card, bool crc_err_fatal);
int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
bool send_status, bool retry_crc_err);
int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
unsigned int timeout_ms, unsigned char timing, unsigned int timeout_ms, unsigned char timing,
bool use_busy_signal, bool send_status, bool retry_crc_err); bool use_busy_signal, bool send_status, bool retry_crc_err);

1
drivers/net/ethernet/qlogic/qed/qed_cxt.c
View file

@ -1024,6 +1024,7 @@ static void qed_ilt_shadow_free(struct qed_hwfn *p_hwfn)
p_dma->p_virt = NULL; p_dma->p_virt = NULL;
} }
kfree(p_mngr->ilt_shadow); kfree(p_mngr->ilt_shadow);
p_mngr->ilt_shadow = NULL;
} }
static int qed_ilt_blk_alloc(struct qed_hwfn *p_hwfn, static int qed_ilt_blk_alloc(struct qed_hwfn *p_hwfn,

17
drivers/net/ethernet/qualcomm/qca_debug.c
View file

@ -30,6 +30,8 @@
#define QCASPI_MAX_REGS 0x20 #define QCASPI_MAX_REGS 0x20
#define QCASPI_RX_MAX_FRAMES 4
static const u16 qcaspi_spi_regs[] = { static const u16 qcaspi_spi_regs[] = {
SPI_REG_BFR_SIZE, SPI_REG_BFR_SIZE,
SPI_REG_WRBUF_SPC_AVA, SPI_REG_WRBUF_SPC_AVA,
@ -266,31 +268,30 @@ qcaspi_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
{ {
struct qcaspi *qca = netdev_priv(dev); struct qcaspi *qca = netdev_priv(dev);
ring->rx_max_pending = 4; ring->rx_max_pending = QCASPI_RX_MAX_FRAMES;
ring->tx_max_pending = TX_RING_MAX_LEN; ring->tx_max_pending = TX_RING_MAX_LEN;
ring->rx_pending = 4; ring->rx_pending = QCASPI_RX_MAX_FRAMES;
ring->tx_pending = qca->txr.count; ring->tx_pending = qca->txr.count;
} }
static int static int
qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
{ {
const struct net_device_ops *ops = dev->netdev_ops;
struct qcaspi *qca = netdev_priv(dev); struct qcaspi *qca = netdev_priv(dev);
if ((ring->rx_pending) || if (ring->rx_pending != QCASPI_RX_MAX_FRAMES ||
(ring->rx_mini_pending) || (ring->rx_mini_pending) ||
(ring->rx_jumbo_pending)) (ring->rx_jumbo_pending))
return -EINVAL; return -EINVAL;
if (netif_running(dev)) if (qca->spi_thread)
ops->ndo_stop(dev); kthread_park(qca->spi_thread);
qca->txr.count = max_t(u32, ring->tx_pending, TX_RING_MIN_LEN); qca->txr.count = max_t(u32, ring->tx_pending, TX_RING_MIN_LEN);
qca->txr.count = min_t(u16, qca->txr.count, TX_RING_MAX_LEN); qca->txr.count = min_t(u16, qca->txr.count, TX_RING_MAX_LEN);
if (netif_running(dev)) if (qca->spi_thread)
ops->ndo_open(dev); kthread_unpark(qca->spi_thread);
return 0; return 0;
} }

20
drivers/net/ethernet/qualcomm/qca_spi.c
View file

@ -552,6 +552,18 @@ qcaspi_spi_thread(void *data)
netdev_info(qca->net_dev, "SPI thread created\n"); netdev_info(qca->net_dev, "SPI thread created\n");
while (!kthread_should_stop()) { while (!kthread_should_stop()) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (kthread_should_park()) {
netif_tx_disable(qca->net_dev);
netif_carrier_off(qca->net_dev);
qcaspi_flush_tx_ring(qca);
kthread_parkme();
if (qca->sync == QCASPI_SYNC_READY) {
netif_carrier_on(qca->net_dev);
netif_wake_queue(qca->net_dev);
}
continue;
}
if ((qca->intr_req == qca->intr_svc) && if ((qca->intr_req == qca->intr_svc) &&
!qca->txr.skb[qca->txr.head]) !qca->txr.skb[qca->txr.head])
schedule(); schedule();
@ -580,11 +592,17 @@ qcaspi_spi_thread(void *data)
if (intr_cause & SPI_INT_CPU_ON) { if (intr_cause & SPI_INT_CPU_ON) {
qcaspi_qca7k_sync(qca, QCASPI_EVENT_CPUON); qcaspi_qca7k_sync(qca, QCASPI_EVENT_CPUON);
/* Frame decoding in progress */
if (qca->frm_handle.state != qca->frm_handle.init)
qca->net_dev->stats.rx_dropped++;
qcafrm_fsm_init_spi(&qca->frm_handle);
qca->stats.device_reset++;
/* not synced. */ /* not synced. */
if (qca->sync != QCASPI_SYNC_READY) if (qca->sync != QCASPI_SYNC_READY)
continue; continue;
qca->stats.device_reset++;
netif_wake_queue(qca->net_dev); netif_wake_queue(qca->net_dev);
netif_carrier_on(qca->net_dev); netif_carrier_on(qca->net_dev);
} }

6
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View file

@ -360,7 +360,11 @@ int stmmac_mdio_register(struct net_device *ndev)
new_bus->parent = priv->device; new_bus->parent = priv->device;
err = of_mdiobus_register(new_bus, mdio_node); err = of_mdiobus_register(new_bus, mdio_node);
if (err != 0) { if (err == -ENODEV) {
err = 0;
dev_info(dev, "MDIO bus is disabled\n");
goto bus_register_fail;
} else if (err) {
dev_err(dev, "Cannot register the MDIO bus\n"); dev_err(dev, "Cannot register the MDIO bus\n");
goto bus_register_fail; goto bus_register_fail;
} }

4
drivers/net/team/team.c
View file

@ -291,8 +291,10 @@ static int __team_options_register(struct team *team,
return 0; return 0;
inst_rollback: inst_rollback:
for (i--; i >= 0; i--) for (i--; i >= 0; i--) {
__team_option_inst_del_option(team, dst_opts[i]); __team_option_inst_del_option(team, dst_opts[i]);
list_del(&dst_opts[i]->list);
}
i = option_count; i = option_count;
alloc_rollback: alloc_rollback:

1
drivers/net/usb/qmi_wwan.c
View file

@ -1250,6 +1250,7 @@ static const struct usb_device_id products[] = {
{QMI_FIXED_INTF(0x19d2, 0x0168, 4)}, {QMI_FIXED_INTF(0x19d2, 0x0168, 4)},
{QMI_FIXED_INTF(0x19d2, 0x0176, 3)}, {QMI_FIXED_INTF(0x19d2, 0x0176, 3)},
{QMI_FIXED_INTF(0x19d2, 0x0178, 3)}, {QMI_FIXED_INTF(0x19d2, 0x0178, 3)},
{QMI_FIXED_INTF(0x19d2, 0x0189, 4)}, /* ZTE MF290 */
{QMI_FIXED_INTF(0x19d2, 0x0191, 4)}, /* ZTE EuFi890 */ {QMI_FIXED_INTF(0x19d2, 0x0191, 4)}, /* ZTE EuFi890 */
{QMI_FIXED_INTF(0x19d2, 0x0199, 1)}, /* ZTE MF820S */ {QMI_FIXED_INTF(0x19d2, 0x0199, 1)}, /* ZTE MF820S */
{QMI_FIXED_INTF(0x19d2, 0x0200, 1)}, {QMI_FIXED_INTF(0x19d2, 0x0200, 1)},

9
drivers/pci/hotplug/acpiphp_glue.c
View file

@ -510,15 +510,12 @@ static void enable_slot(struct acpiphp_slot *slot, bool bridge)
if (pass && dev->subordinate) { if (pass && dev->subordinate) {
check_hotplug_bridge(slot, dev); check_hotplug_bridge(slot, dev);
pcibios_resource_survey_bus(dev->subordinate); pcibios_resource_survey_bus(dev->subordinate);
if (pci_is_root_bus(bus)) __pci_bus_size_bridges(dev->subordinate,
__pci_bus_size_bridges(dev->subordinate, &add_list); &add_list);
} }
} }
} }
if (pci_is_root_bus(bus)) __pci_bus_assign_resources(bus, &add_list, NULL);
__pci_bus_assign_resources(bus, &add_list, NULL);
else
pci_assign_unassigned_bridge_resources(bus->self);
} }
acpiphp_sanitize_bus(bus); acpiphp_sanitize_bus(bus);

4
drivers/platform/x86/intel_telemetry_core.c
View file

@ -110,7 +110,7 @@ static const struct telemetry_core_ops telm_defpltops = {
/** /**
* telemetry_update_events() - Update telemetry Configuration * telemetry_update_events() - Update telemetry Configuration
* @pss_evtconfig: PSS related config. No change if num_evts = 0. * @pss_evtconfig: PSS related config. No change if num_evts = 0.
* @pss_evtconfig: IOSS related config. No change if num_evts = 0. * @ioss_evtconfig: IOSS related config. No change if num_evts = 0.
* *
* This API updates the IOSS & PSS Telemetry configuration. Old config * This API updates the IOSS & PSS Telemetry configuration. Old config
* is overwritten. Call telemetry_reset_events when logging is over * is overwritten. Call telemetry_reset_events when logging is over
@ -184,7 +184,7 @@ EXPORT_SYMBOL_GPL(telemetry_reset_events);
/** /**
* telemetry_get_eventconfig() - Returns the pss and ioss events enabled * telemetry_get_eventconfig() - Returns the pss and ioss events enabled
* @pss_evtconfig: Pointer to PSS related configuration. * @pss_evtconfig: Pointer to PSS related configuration.
* @pss_evtconfig: Pointer to IOSS related configuration. * @ioss_evtconfig: Pointer to IOSS related configuration.
* @pss_len: Number of u32 elements allocated for pss_evtconfig array * @pss_len: Number of u32 elements allocated for pss_evtconfig array
* @ioss_len: Number of u32 elements allocated for ioss_evtconfig array * @ioss_len: Number of u32 elements allocated for ioss_evtconfig array
* *

4
fs/ext4/mballoc.c
View file

@ -3181,6 +3181,10 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
start = max(start, rounddown(ac->ac_o_ex.fe_logical, start = max(start, rounddown(ac->ac_o_ex.fe_logical,
(ext4_lblk_t)EXT4_BLOCKS_PER_GROUP(ac->ac_sb))); (ext4_lblk_t)EXT4_BLOCKS_PER_GROUP(ac->ac_sb)));
/* avoid unnecessary preallocation that may trigger assertions */
if (start + size > EXT_MAX_BLOCKS)
size = EXT_MAX_BLOCKS - start;
/* don't cover already allocated blocks in selected range */ /* don't cover already allocated blocks in selected range */
if (ar->pleft && start <= ar->lleft) { if (ar->pleft && start <= ar->lleft) {
size -= ar->lleft + 1 - start; size -= ar->lleft + 1 - start;

2
include/asm-generic/qspinlock.h
View file

@ -47,7 +47,7 @@ static __always_inline int queued_spin_is_locked(struct qspinlock *lock)
*/ */
static __always_inline int queued_spin_value_unlocked(struct qspinlock lock) static __always_inline int queued_spin_value_unlocked(struct qspinlock lock)
{ {
return !atomic_read(&lock.val); return !lock.val.counter;
} }
/** /**

6
include/linux/cred.h
View file

@ -114,7 +114,7 @@ static inline int groups_search(const struct group_info *group_info, kgid_t grp)
* same context as task->real_cred. * same context as task->real_cred.
*/ */
struct cred { struct cred {
atomic_t usage; atomic_long_t usage;
#ifdef CONFIG_DEBUG_CREDENTIALS #ifdef CONFIG_DEBUG_CREDENTIALS
atomic_t subscribers; /* number of processes subscribed */ atomic_t subscribers; /* number of processes subscribed */
void *put_addr; void *put_addr;
@ -231,7 +231,7 @@ static inline bool cap_ambient_invariant_ok(const struct cred *cred)
*/ */
static inline struct cred *get_new_cred(struct cred *cred) static inline struct cred *get_new_cred(struct cred *cred)
{ {
atomic_inc(&cred->usage); atomic_long_inc(&cred->usage);
return cred; return cred;
} }
@ -275,7 +275,7 @@ static inline void put_cred(const struct cred *_cred)
if (cred) { if (cred) {
validate_creds(cred); validate_creds(cred);
if (atomic_dec_and_test(&(cred)->usage)) if (atomic_long_dec_and_test(&(cred)->usage))
__put_cred(cred); __put_cred(cred);
} }
} }

66
kernel/cred.c
View file

@ -101,17 +101,17 @@ static void put_cred_rcu(struct rcu_head *rcu)
#ifdef CONFIG_DEBUG_CREDENTIALS #ifdef CONFIG_DEBUG_CREDENTIALS
if (cred->magic != CRED_MAGIC_DEAD || if (cred->magic != CRED_MAGIC_DEAD ||
atomic_read(&cred->usage) != 0 || atomic_long_read(&cred->usage) != 0 ||
read_cred_subscribers(cred) != 0) read_cred_subscribers(cred) != 0)
panic("CRED: put_cred_rcu() sees %p with" panic("CRED: put_cred_rcu() sees %p with"
" mag %x, put %p, usage %d, subscr %d\n", " mag %x, put %p, usage %ld, subscr %d\n",
cred, cred->magic, cred->put_addr, cred, cred->magic, cred->put_addr,
atomic_read(&cred->usage), atomic_long_read(&cred->usage),
read_cred_subscribers(cred)); read_cred_subscribers(cred));
#else #else
if (atomic_read(&cred->usage) != 0) if (atomic_long_read(&cred->usage) != 0)
panic("CRED: put_cred_rcu() sees %p with usage %d\n", panic("CRED: put_cred_rcu() sees %p with usage %ld\n",
cred, atomic_read(&cred->usage)); cred, atomic_long_read(&cred->usage));
#endif #endif
security_cred_free(cred); security_cred_free(cred);
@ -134,11 +134,11 @@ static void put_cred_rcu(struct rcu_head *rcu)
*/ */
void __put_cred(struct cred *cred) void __put_cred(struct cred *cred)
{ {
kdebug("__put_cred(%p{%d,%d})", cred, kdebug("__put_cred(%p{%ld,%d})", cred,
atomic_read(&cred->usage), atomic_long_read(&cred->usage),
read_cred_subscribers(cred)); read_cred_subscribers(cred));
BUG_ON(atomic_read(&cred->usage) != 0); BUG_ON(atomic_long_read(&cred->usage) != 0);
#ifdef CONFIG_DEBUG_CREDENTIALS #ifdef CONFIG_DEBUG_CREDENTIALS
BUG_ON(read_cred_subscribers(cred) != 0); BUG_ON(read_cred_subscribers(cred) != 0);
cred->magic = CRED_MAGIC_DEAD; cred->magic = CRED_MAGIC_DEAD;
@ -161,8 +161,8 @@ void exit_creds(struct task_struct *tsk)
{ {
struct cred *cred; struct cred *cred;
kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred, kdebug("exit_creds(%u,%p,%p,{%ld,%d})", tsk->pid, tsk->real_cred, tsk->cred,
atomic_read(&tsk->cred->usage), atomic_long_read(&tsk->cred->usage),
read_cred_subscribers(tsk->cred)); read_cred_subscribers(tsk->cred));
cred = (struct cred *) tsk->real_cred; cred = (struct cred *) tsk->real_cred;
@ -197,7 +197,7 @@ const struct cred *get_task_cred(struct task_struct *task)
do { do {
cred = __task_cred((task)); cred = __task_cred((task));
BUG_ON(!cred); BUG_ON(!cred);
} while (!atomic_inc_not_zero(&((struct cred *)cred)->usage)); } while (!atomic_long_inc_not_zero(&((struct cred *)cred)->usage));
rcu_read_unlock(); rcu_read_unlock();
return cred; return cred;
@ -215,7 +215,7 @@ struct cred *cred_alloc_blank(void)
if (!new) if (!new)
return NULL; return NULL;
atomic_set(&new->usage, 1); atomic_long_set(&new->usage, 1);
#ifdef CONFIG_DEBUG_CREDENTIALS #ifdef CONFIG_DEBUG_CREDENTIALS
new->magic = CRED_MAGIC; new->magic = CRED_MAGIC;
#endif #endif
@ -262,7 +262,7 @@ struct cred *prepare_creds(void)
memcpy(new, old, sizeof(struct cred)); memcpy(new, old, sizeof(struct cred));
new->non_rcu = 0; new->non_rcu = 0;
atomic_set(&new->usage, 1); atomic_long_set(&new->usage, 1);
set_cred_subscribers(new, 0); set_cred_subscribers(new, 0);
get_group_info(new->group_info); get_group_info(new->group_info);
get_uid(new->user); get_uid(new->user);
@ -338,8 +338,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
p->real_cred = get_cred(p->cred); p->real_cred = get_cred(p->cred);
get_cred(p->cred); get_cred(p->cred);
alter_cred_subscribers(p->cred, 2); alter_cred_subscribers(p->cred, 2);
kdebug("share_creds(%p{%d,%d})", kdebug("share_creds(%p{%ld,%d})",
p->cred, atomic_read(&p->cred->usage), p->cred, atomic_long_read(&p->cred->usage),
read_cred_subscribers(p->cred)); read_cred_subscribers(p->cred));
atomic_inc(&p->cred->user->processes); atomic_inc(&p->cred->user->processes);
return 0; return 0;
@ -429,8 +429,8 @@ int commit_creds(struct cred *new)
struct task_struct *task = current; struct task_struct *task = current;
const struct cred *old = task->real_cred; const struct cred *old = task->real_cred;
kdebug("commit_creds(%p{%d,%d})", new, kdebug("commit_creds(%p{%ld,%d})", new,
atomic_read(&new->usage), atomic_long_read(&new->usage),
read_cred_subscribers(new)); read_cred_subscribers(new));
BUG_ON(task->cred != old); BUG_ON(task->cred != old);
@ -439,7 +439,7 @@ int commit_creds(struct cred *new)
validate_creds(old); validate_creds(old);
validate_creds(new); validate_creds(new);
#endif #endif
BUG_ON(atomic_read(&new->usage) < 1); BUG_ON(atomic_long_read(&new->usage) < 1);
get_cred(new); /* we will require a ref for the subj creds too */ get_cred(new); /* we will require a ref for the subj creds too */
@ -512,14 +512,14 @@ EXPORT_SYMBOL(commit_creds);
*/ */
void abort_creds(struct cred *new) void abort_creds(struct cred *new)
{ {
kdebug("abort_creds(%p{%d,%d})", new, kdebug("abort_creds(%p{%ld,%d})", new,
atomic_read(&new->usage), atomic_long_read(&new->usage),
read_cred_subscribers(new)); read_cred_subscribers(new));
#ifdef CONFIG_DEBUG_CREDENTIALS #ifdef CONFIG_DEBUG_CREDENTIALS
BUG_ON(read_cred_subscribers(new) != 0); BUG_ON(read_cred_subscribers(new) != 0);
#endif #endif
BUG_ON(atomic_read(&new->usage) < 1); BUG_ON(atomic_long_read(&new->usage) < 1);
put_cred(new); put_cred(new);
} }
EXPORT_SYMBOL(abort_creds); EXPORT_SYMBOL(abort_creds);
@ -535,8 +535,8 @@ const struct cred *override_creds(const struct cred *new)
{ {
const struct cred *old = current->cred; const struct cred *old = current->cred;
kdebug("override_creds(%p{%d,%d})", new, kdebug("override_creds(%p{%ld,%d})", new,
atomic_read(&new->usage), atomic_long_read(&new->usage),
read_cred_subscribers(new)); read_cred_subscribers(new));
validate_creds(old); validate_creds(old);
@ -558,8 +558,8 @@ const struct cred *override_creds(const struct cred *new)
rcu_assign_pointer(current->cred, new); rcu_assign_pointer(current->cred, new);
alter_cred_subscribers(old, -1); alter_cred_subscribers(old, -1);
kdebug("override_creds() = %p{%d,%d}", old, kdebug("override_creds() = %p{%ld,%d}", old,
atomic_read(&old->usage), atomic_long_read(&old->usage),
read_cred_subscribers(old)); read_cred_subscribers(old));
return old; return old;
} }
@ -576,8 +576,8 @@ void revert_creds(const struct cred *old)
{ {
const struct cred *override = current->cred; const struct cred *override = current->cred;
kdebug("revert_creds(%p{%d,%d})", old, kdebug("revert_creds(%p{%ld,%d})", old,
atomic_read(&old->usage), atomic_long_read(&old->usage),
read_cred_subscribers(old)); read_cred_subscribers(old));
validate_creds(old); validate_creds(old);
@ -637,7 +637,7 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon)
*new = *old; *new = *old;
new->non_rcu = 0; new->non_rcu = 0;
atomic_set(&new->usage, 1); atomic_long_set(&new->usage, 1);
set_cred_subscribers(new, 0); set_cred_subscribers(new, 0);
get_uid(new->user); get_uid(new->user);
get_user_ns(new->user_ns); get_user_ns(new->user_ns);
@ -760,8 +760,8 @@ static void dump_invalid_creds(const struct cred *cred, const char *label,
cred == tsk->cred ? "[eff]" : ""); cred == tsk->cred ? "[eff]" : "");
printk(KERN_ERR "CRED: ->magic=%x, put_addr=%p\n", printk(KERN_ERR "CRED: ->magic=%x, put_addr=%p\n",
cred->magic, cred->put_addr); cred->magic, cred->put_addr);
printk(KERN_ERR "CRED: ->usage=%d, subscr=%d\n", printk(KERN_ERR "CRED: ->usage=%ld, subscr=%d\n",
atomic_read(&cred->usage), atomic_long_read(&cred->usage),
read_cred_subscribers(cred)); read_cred_subscribers(cred));
printk(KERN_ERR "CRED: ->*uid = { %d,%d,%d,%d }\n", printk(KERN_ERR "CRED: ->*uid = { %d,%d,%d,%d }\n",
from_kuid_munged(&init_user_ns, cred->uid), from_kuid_munged(&init_user_ns, cred->uid),
@ -833,9 +833,9 @@ EXPORT_SYMBOL(__validate_process_creds);
*/ */
void validate_creds_for_do_exit(struct task_struct *tsk) void validate_creds_for_do_exit(struct task_struct *tsk)
{ {
kdebug("validate_creds_for_do_exit(%p,%p{%d,%d})", kdebug("validate_creds_for_do_exit(%p,%p{%ld,%d})",
tsk->real_cred, tsk->cred, tsk->real_cred, tsk->cred,
atomic_read(&tsk->cred->usage), atomic_long_read(&tsk->cred->usage),
read_cred_subscribers(tsk->cred)); read_cred_subscribers(tsk->cred));
__validate_process_creds(tsk, __FILE__, __LINE__); __validate_process_creds(tsk, __FILE__, __LINE__);

2
kernel/trace/ring_buffer.c
View file

@ -1344,6 +1344,8 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)
free_buffer_page(bpage); free_buffer_page(bpage);
} }
free_page((unsigned long)cpu_buffer->free_page);
kfree(cpu_buffer); kfree(cpu_buffer);
} }

9
net/appletalk/ddp.c
View file

@ -1808,15 +1808,14 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
break; break;
} }
case TIOCINQ: { case TIOCINQ: {
/* struct sk_buff *skb;
* These two are safe on a single CPU system as only
* user tasks fiddle here
*/
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
long amount = 0; long amount = 0;
spin_lock_irq(&sk->sk_receive_queue.lock);
skb = skb_peek(&sk->sk_receive_queue);
if (skb) if (skb)
amount = skb->len - sizeof(struct ddpehdr); amount = skb->len - sizeof(struct ddpehdr);
spin_unlock_irq(&sk->sk_receive_queue.lock);
rc = put_user(amount, (int __user *)argp); rc = put_user(amount, (int __user *)argp);
break; break;
} }

7
net/atm/ioctl.c
View file

@ -71,14 +71,17 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd,
case SIOCINQ: case SIOCINQ:
{ {
struct sk_buff *skb; struct sk_buff *skb;
int amount;
if (sock->state != SS_CONNECTED) { if (sock->state != SS_CONNECTED) {
error = -EINVAL; error = -EINVAL;
goto done; goto done;
} }
spin_lock_irq(&sk->sk_receive_queue.lock);
skb = skb_peek(&sk->sk_receive_queue); skb = skb_peek(&sk->sk_receive_queue);
error = put_user(skb ? skb->len : 0, amount = skb ? skb->len : 0;
(int __user *)argp) ? -EFAULT : 0; spin_unlock_irq(&sk->sk_receive_queue.lock);
error = put_user(amount, (int __user *)argp) ? -EFAULT : 0;
goto done; goto done;
} }
case SIOCGSTAMP: /* borrowed from IP */ case SIOCGSTAMP: /* borrowed from IP */

6
net/ipv4/tcp_output.c
View file

@ -2890,7 +2890,13 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
if (skb_still_in_host_queue(sk, skb)) if (skb_still_in_host_queue(sk, skb))
return -EBUSY; return -EBUSY;
start:
if (before(TCP_SKB_CB(skb)->seq, tp->snd_una)) { if (before(TCP_SKB_CB(skb)->seq, tp->snd_una)) {
if (unlikely(TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN)) {
TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_SYN;
TCP_SKB_CB(skb)->seq++;
goto start;
}
if (unlikely(before(TCP_SKB_CB(skb)->end_seq, tp->snd_una))) { if (unlikely(before(TCP_SKB_CB(skb)->end_seq, tp->snd_una))) {
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
return -EINVAL; return -EINVAL;

4
net/rose/af_rose.c
View file

@ -1308,9 +1308,11 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case TIOCINQ: { case TIOCINQ: {
struct sk_buff *skb; struct sk_buff *skb;
long amount = 0L; long amount = 0L;
/* These two are safe on a single CPU system as only user tasks fiddle here */
spin_lock_irq(&sk->sk_receive_queue.lock);
if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL) if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)
amount = skb->len; amount = skb->len;
spin_unlock_irq(&sk->sk_receive_queue.lock);
return put_user(amount, (unsigned int __user *) argp); return put_user(amount, (unsigned int __user *) argp);
} }

2
net/vmw_vsock/virtio_transport_common.c
View file

@ -352,7 +352,7 @@ static s64 virtio_transport_has_space(struct vsock_sock *vsk)
struct virtio_vsock_sock *vvs = vsk->trans; struct virtio_vsock_sock *vvs = vsk->trans;
s64 bytes; s64 bytes;
bytes = vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt); bytes = (s64)vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt);
if (bytes < 0) if (bytes < 0)
bytes = 0; bytes = 0;

12
scripts/sign-file.c
View file

@ -322,7 +322,7 @@ int main(int argc, char **argv)
CMS_NOSMIMECAP | use_keyid | CMS_NOSMIMECAP | use_keyid |
use_signed_attrs), use_signed_attrs),
"CMS_add1_signer"); "CMS_add1_signer");
ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) != 1,
"CMS_final"); "CMS_final");
#else #else
@ -341,10 +341,10 @@ int main(int argc, char **argv)
b = BIO_new_file(sig_file_name, "wb"); b = BIO_new_file(sig_file_name, "wb");
ERR(!b, "%s", sig_file_name); ERR(!b, "%s", sig_file_name);
#ifndef USE_PKCS7 #ifndef USE_PKCS7
ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) != 1,
"%s", sig_file_name); "%s", sig_file_name);
#else #else
ERR(i2d_PKCS7_bio(b, pkcs7) < 0, ERR(i2d_PKCS7_bio(b, pkcs7) != 1,
"%s", sig_file_name); "%s", sig_file_name);
#endif #endif
BIO_free(b); BIO_free(b);
@ -374,9 +374,9 @@ int main(int argc, char **argv)
if (!raw_sig) { if (!raw_sig) {
#ifndef USE_PKCS7 #ifndef USE_PKCS7
ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", dest_name); ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) != 1, "%s", dest_name);
#else #else
ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name); ERR(i2d_PKCS7_bio(bd, pkcs7) != 1, "%s", dest_name);
#endif #endif
} else { } else {
BIO *b; BIO *b;
@ -396,7 +396,7 @@ int main(int argc, char **argv)
ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name); ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name);
ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name); ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name);
ERR(BIO_free(bd) < 0, "%s", dest_name); ERR(BIO_free(bd) != 1, "%s", dest_name);
/* Finally, if we're signing in place, replace the original. */ /* Finally, if we're signing in place, replace the original. */
if (replace_orig) if (replace_orig)