- Linux-stable-mirror - lists.linaro.org

Re: [PATCH RFC] svcrdma: Ignore source port when computing DRC hash

by Sasha Levin

Hi, [This is an automated email] This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all The bot has tested the following trees: v5.1.7, v5.0.21, v4.19.48, v4.14.123, v4.9.180, v4.4.180. v5.1.7: Build OK! v5.0.21: Build OK! v4.19.48: Build OK! v4.14.123: Build OK! v4.9.180: Build failed! Errors: net/sunrpc/xprtrdma/svc_rdma_transport.c:712:2: error: implicit declaration of function ‘rpc_set_port’; did you mean ‘rpc_net_ns’? [-Werror=implicit-function-declaration] v4.4.180: Build failed! Errors: net/sunrpc/xprtrdma/svc_rdma_transport.c:635:2: error: implicit declaration of function ‘rpc_set_port’; did you mean ‘rpc_net_ns’? [-Werror=implicit-function-declaration] How should we proceed with this patch? -- Thanks, Sasha

5 years, 12 months

2
1
0 0

[SRU][Bionic][PATCH] selinux: use kernel linux/socket.h for genheaders and mdp

by Dimitri John Ledkov

From: Paulo Alcantara <paulo(a)paulo.ac> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1823429 When compiling genheaders and mdp from a newer host kernel, the following error happens: In file included from scripts/selinux/genheaders/genheaders.c:18: ./security/selinux/include/classmap.h:238:2: error: #error New address family defined, please update secclass_map. #error New address family defined, please update secclass_map. ^~~~~ make[3]: *** [scripts/Makefile.host:107: scripts/selinux/genheaders/genheaders] Error 1 make[2]: *** [scripts/Makefile.build:599: scripts/selinux/genheaders] Error 2 make[1]: *** [scripts/Makefile.build:599: scripts/selinux] Error 2 make[1]: *** Waiting for unfinished jobs.... Instead of relying on the host definition, include linux/socket.h in classmap.h to have PF_MAX. Cc: stable(a)vger.kernel.org Signed-off-by: Paulo Alcantara <paulo(a)paulo.ac> Acked-by: Stephen Smalley <sds(a)tycho.nsa.gov> [PM: manually merge in mdp.c, subject line tweaks] Signed-off-by: Paul Moore <paul(a)paul-moore.com> (cherry picked from commit dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e) Signed-off-by: Dimitri John Ledkov <xnox(a)ubuntu.com> --- scripts/selinux/genheaders/genheaders.c | 1 - scripts/selinux/mdp/mdp.c | 1 - security/selinux/include/classmap.h | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c index fa48fabcb330..3cc4893d98cc 100644 --- a/scripts/selinux/genheaders/genheaders.c +++ b/scripts/selinux/genheaders/genheaders.c @@ -9,7 +9,6 @@ #include <string.h> #include <errno.h> #include <ctype.h> -#include <sys/socket.h> struct security_class_mapping { const char *name; diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c index ffe8179f5d41..c29fa4a6228d 100644 --- a/scripts/selinux/mdp/mdp.c +++ b/scripts/selinux/mdp/mdp.c @@ -32,7 +32,6 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <sys/socket.h> static void usage(char *name) { diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index acdee7795297..5ae315ab060b 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include <linux/capability.h> +#include <linux/socket.h> #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map" -- 2.20.1

5 years, 12 months

1
0
0 0

[PATCH] btrfs: fix out-of-bounds access in property handling

by Naohiro Aota

xattr value is not NULL-terminated string. When you specify "lz" as the property value, strncmp("lzo", value, 3) will try to read one byte after the value buffer, causing the following OOB access. Fix this out-of-bound by explicitly check the required length. [ 1519.998589] ================================================================== [ 1520.007505] BUG: KASAN: slab-out-of-bounds in strncmp+0xab/0xc0 [ 1520.015116] Read of size 1 at addr ffff8886daec16c2 by task btrfs/15317 [ 1520.026628] CPU: 4 PID: 15317 Comm: btrfs Not tainted 5.1.0-rc7+ #3 [ 1520.034635] Hardware name: Supermicro X10SLL-F/X10SLL-F, BIOS 3.0 04/24/2015 [ 1520.043416] Call Trace: [ 1520.047562] dump_stack+0x71/0xa0 [ 1520.052584] print_address_description+0x65/0x229 [ 1520.058997] ? strncmp+0xab/0xc0 [ 1520.063929] ? strncmp+0xab/0xc0 [ 1520.068834] kasan_report.cold+0x1a/0x38 [ 1520.074439] ? strncmp+0xab/0xc0 [ 1520.079343] strncmp+0xab/0xc0 [ 1520.084110] prop_compression_validate+0x22/0x70 [btrfs] [ 1520.091135] btrfs_xattr_handler_set_prop+0x6c/0x1f0 [btrfs] [ 1520.098452] __vfs_setxattr+0xd8/0x130 [ 1520.103821] ? xattr_resolve_name+0x3e0/0x3e0 [ 1520.109812] __vfs_setxattr_noperm+0xeb/0x3b0 [ 1520.115790] vfs_setxattr+0xa3/0xd0 [ 1520.120898] setxattr+0x17a/0x2c0 [ 1520.125824] ? vfs_setxattr+0xd0/0xd0 [ 1520.131102] ? __pmd_alloc+0x560/0x560 [ 1520.136452] ? __do_sys_newfstat+0xd3/0xe0 [ 1520.142123] ? __ia32_sys_newfstatat+0xf0/0xf0 [ 1520.148140] ? __kasan_slab_free+0x141/0x170 [ 1520.153955] ? handle_mm_fault+0x1ae/0x640 [ 1520.159564] __x64_sys_fsetxattr+0x1a0/0x220 [ 1520.165347] do_syscall_64+0xa0/0x2e0 [ 1520.170515] ? page_fault+0x8/0x30 [ 1520.175408] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 1520.181975] RIP: 0033:0x7f84f257ae6e [ 1520.187068] Code: 48 8b 0d 1d 70 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 be 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d ea 6f 0c 00 f7 d8 64 89 01 48 [ 1520.209083] RSP: 002b:00007fff87996fa8 EFLAGS: 00000246 ORIG_RAX: 00000000000000be [ 1520.218336] RAX: ffffffffffffffda RBX: 000000000000000b RCX: 00007f84f257ae6e [ 1520.227132] RDX: 00007fff8799798b RSI: 00005561caf83270 RDI: 0000000000000003 [ 1520.235912] RBP: 00007fff8799798b R08: 0000000000000000 R09: 00005561caf83290 [ 1520.244691] R10: 0000000000000002 R11: 0000000000000246 R12: 00005561caf83270 [ 1520.253462] R13: 0000000000000003 R14: 00007fff87997972 R15: 00007fff8799797f [ 1520.265443] Allocated by task 15317: [ 1520.270697] __kasan_kmalloc.constprop.0+0xc2/0xd0 [ 1520.277677] setxattr+0xe8/0x2c0 [ 1520.283084] __x64_sys_fsetxattr+0x1a0/0x220 [ 1520.289540] do_syscall_64+0xa0/0x2e0 [ 1520.295379] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 1520.306288] Freed by task 12227: [ 1520.311632] __kasan_slab_free+0x12c/0x170 [ 1520.317828] kfree+0x90/0x1e0 [ 1520.322891] btrfs_free_block_groups+0x8a1/0xd80 [btrfs] [ 1520.330313] close_ctree+0x37e/0x650 [btrfs] [ 1520.336627] generic_shutdown_super+0x12e/0x320 [ 1520.343177] kill_anon_super+0x36/0x60 [ 1520.348983] btrfs_kill_super+0x3d/0x2c0 [btrfs] [ 1520.355636] deactivate_locked_super+0x85/0xd0 [ 1520.362108] deactivate_super+0x122/0x140 [ 1520.368166] cleanup_mnt+0x9f/0x130 [ 1520.373699] task_work_run+0x131/0x1c0 [ 1520.379490] exit_to_usermode_loop+0x133/0x160 [ 1520.386002] do_syscall_64+0x259/0x2e0 [ 1520.391796] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 1520.402415] The buggy address belongs to the object at ffff8886daec16c0 which belongs to the cache kmalloc-8 of size 8 [ 1520.418769] The buggy address is located 2 bytes inside of 8-byte region [ffff8886daec16c0, ffff8886daec16c8) [ 1520.434407] The buggy address belongs to the page: [ 1520.441358] page:ffffea001b6bb040 count:1 mapcount:0 mapping:ffff8886ff40fb80 index:0x0 [ 1520.451601] flags: 0x17ffe000000200(slab) [ 1520.457868] raw: 0017ffe000000200 ffffea001bedcec0 0000000700000007 ffff8886ff40fb80 [ 1520.467940] raw: 0000000000000000 0000000080aa00aa 00000001ffffffff 0000000000000000 [ 1520.478024] page dumped because: kasan: bad access detected [ 1520.489795] Memory state around the buggy address: [ 1520.496963] ffff8886daec1580: fc 00 fc fc 00 fc fc 00 fc fc 00 fc fc 00 fc fc [ 1520.506621] ffff8886daec1600: 00 fc fc 04 fc fc fb fc fc fb fc fc fb fc fc fb [ 1520.516277] >ffff8886daec1680: fc fc 04 fc fc 00 fc fc 02 fc fc fb fc fc 00 fc [ 1520.525915] ^ [ 1520.533584] ffff8886daec1700: fc 00 fc fc 00 fc fc 00 fc fc 00 fc fc 04 fc fc [ 1520.543137] ffff8886daec1780: fb fc fc 00 fc fc 00 fc fc 00 fc fc 00 fc fc 00 [ 1520.552642] ================================================================== Fixes: 272e5326c783 ("btrfs: prop: fix vanished compression property after failed set") Fixes: 50398fde997f ("btrfs: prop: fix zstd compression parameter validation") Cc: stable(a)vger.kernel.org # 4.14+: 802a5c69584a: btrfs: prop: use common helper for type to string conversion Cc: stable(a)vger.kernel.org # 4.14+: 3dcf96c7b9fe: btrfs: drop redundant forward declaration in props.c Cc: stable(a)vger.kernel.org # 4.14+ Signed-off-by: Naohiro Aota <naohiro.aota(a)wdc.com> --- fs/btrfs/props.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index a9e2e66152ee..428141bf545d 100644 --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -257,11 +257,11 @@ static int prop_compression_validate(const char *value, size_t len) if (!value) return 0; - if (!strncmp("lzo", value, 3)) + if (len >= 3 && !strncmp("lzo", value, 3)) return 0; - else if (!strncmp("zlib", value, 4)) + else if (len >= 4 && !strncmp("zlib", value, 4)) return 0; - else if (!strncmp("zstd", value, 4)) + else if (len >= 4 && !strncmp("zstd", value, 4)) return 0; return -EINVAL; @@ -281,12 +281,12 @@ static int prop_compression_apply(struct inode *inode, const char *value, return 0; } - if (!strncmp("lzo", value, 3)) { + if (len >= 3 && !strncmp("lzo", value, 3)) { type = BTRFS_COMPRESS_LZO; btrfs_set_fs_incompat(fs_info, COMPRESS_LZO); - } else if (!strncmp("zlib", value, 4)) { + } else if (len >= 4 && !strncmp("zlib", value, 4)) { type = BTRFS_COMPRESS_ZLIB; - } else if (!strncmp("zstd", value, 4)) { + } else if (len >= 4 && !strncmp("zstd", value, 4)) { type = BTRFS_COMPRESS_ZSTD; btrfs_set_fs_incompat(fs_info, COMPRESS_ZSTD); } else { -- 2.21.0

5 years, 12 months

3
2
0 0

[PATCH] usb: dwc2: host: Fix wMaxPacketSize handling (fix webcam regression)

by Douglas Anderson

In commit abb621844f6a ("usb: ch9: make usb_endpoint_maxp() return only packet size") the API to usb_endpoint_maxp() changed. It used to just return wMaxPacketSize but after that commit it returned wMaxPacketSize with the high bits (the multiplier) masked off. If you wanted to get the multiplier it was now up to your code to call the new usb_endpoint_maxp_mult() which was introduced in commit 541b6fe63023 ("usb: add helper to extract bits 12:11 of wMaxPacketSize"). Prior to the API change most host drivers were updated, but no update was made to dwc2. Presumably it was assumed that dwc2 was too simplistic to use the multiplier and thus just didn't support a certain class of USB devices. However, it turns out that dwc2 did use the multiplier and many devices using it were working quite nicely. That means that many USB devices have been broken since the API change. One such device is a Logitech HD Pro Webcam C920. Specifically, though dwc2 didn't directly call usb_endpoint_maxp(), it did call usb_maxpacket() which in turn called usb_endpoint_maxp(). Let's update dwc2 to work properly with the new API. Fixes: abb621844f6a ("usb: ch9: make usb_endpoint_maxp() return only packet size") Cc: stable(a)vger.kernel.org Signed-off-by: Douglas Anderson <dianders(a)chromium.org> --- drivers/usb/dwc2/hcd.c | 29 +++++++++++++++++------------ drivers/usb/dwc2/hcd.h | 20 +++++++++++--------- drivers/usb/dwc2/hcd_intr.c | 5 +++-- drivers/usb/dwc2/hcd_queue.c | 10 ++++++---- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index b50ec3714fd8..5c51bf5506d1 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -2608,7 +2608,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh) chan->dev_addr = dwc2_hcd_get_dev_addr(&urb->pipe_info); chan->ep_num = dwc2_hcd_get_ep_num(&urb->pipe_info); chan->speed = qh->dev_speed; - chan->max_packet = dwc2_max_packet(qh->maxp); + chan->max_packet = qh->maxp; chan->xfer_started = 0; chan->halt_status = DWC2_HC_XFER_NO_HALT_STATUS; @@ -2686,7 +2686,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh) * This value may be modified when the transfer is started * to reflect the actual transfer length */ - chan->multi_count = dwc2_hb_mult(qh->maxp); + chan->multi_count = qh->maxp_mult; if (hsotg->params.dma_desc_enable) { chan->desc_list_addr = qh->desc_list_dma; @@ -3806,19 +3806,21 @@ static struct dwc2_hcd_urb *dwc2_hcd_urb_alloc(struct dwc2_hsotg *hsotg, static void dwc2_hcd_urb_set_pipeinfo(struct dwc2_hsotg *hsotg, struct dwc2_hcd_urb *urb, u8 dev_addr, - u8 ep_num, u8 ep_type, u8 ep_dir, u16 mps) + u8 ep_num, u8 ep_type, u8 ep_dir, + u16 maxp, u16 maxp_mult) { if (dbg_perio() || ep_type == USB_ENDPOINT_XFER_BULK || ep_type == USB_ENDPOINT_XFER_CONTROL) dev_vdbg(hsotg->dev, - "addr=%d, ep_num=%d, ep_dir=%1x, ep_type=%1x, mps=%d\n", - dev_addr, ep_num, ep_dir, ep_type, mps); + "addr=%d, ep_num=%d, ep_dir=%1x, ep_type=%1x, maxp=%d (%d mult)\n", + dev_addr, ep_num, ep_dir, ep_type, maxp, maxp_mult); urb->pipe_info.dev_addr = dev_addr; urb->pipe_info.ep_num = ep_num; urb->pipe_info.pipe_type = ep_type; urb->pipe_info.pipe_dir = ep_dir; - urb->pipe_info.mps = mps; + urb->pipe_info.maxp = maxp; + urb->pipe_info.maxp_mult = maxp_mult; } /* @@ -3909,8 +3911,9 @@ void dwc2_hcd_dump_state(struct dwc2_hsotg *hsotg) dwc2_hcd_is_pipe_in(&urb->pipe_info) ? "IN" : "OUT"); dev_dbg(hsotg->dev, - " Max packet size: %d\n", - dwc2_hcd_get_mps(&urb->pipe_info)); + " Max packet size: %d (%d mult)\n", + dwc2_hcd_get_maxp(&urb->pipe_info), + dwc2_hcd_get_maxp_mult(&urb->pipe_info)); dev_dbg(hsotg->dev, " transfer_buffer: %p\n", urb->buf); @@ -4510,8 +4513,10 @@ static void dwc2_dump_urb_info(struct usb_hcd *hcd, struct urb *urb, } dev_vdbg(hsotg->dev, " Speed: %s\n", speed); - dev_vdbg(hsotg->dev, " Max packet size: %d\n", - usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe))); + dev_vdbg(hsotg->dev, " Max packet size: %d (%d mult)\n", + usb_endpoint_maxp(&urb->ep->desc), + usb_endpoint_maxp_mult(&urb->ep->desc)); + dev_vdbg(hsotg->dev, " Data buffer length: %d\n", urb->transfer_buffer_length); dev_vdbg(hsotg->dev, " Transfer buffer: %p, Transfer DMA: %08lx\n", @@ -4594,8 +4599,8 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, dwc2_hcd_urb_set_pipeinfo(hsotg, dwc2_urb, usb_pipedevice(urb->pipe), usb_pipeendpoint(urb->pipe), ep_type, usb_pipein(urb->pipe), - usb_maxpacket(urb->dev, urb->pipe, - !(usb_pipein(urb->pipe)))); + usb_endpoint_maxp(&ep->desc), + usb_endpoint_maxp_mult(&ep->desc)); buf = urb->transfer_buffer; diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h index c089ffa1f0a8..ce6445a06588 100644 --- a/drivers/usb/dwc2/hcd.h +++ b/drivers/usb/dwc2/hcd.h @@ -171,7 +171,8 @@ struct dwc2_hcd_pipe_info { u8 ep_num; u8 pipe_type; u8 pipe_dir; - u16 mps; + u16 maxp; + u16 maxp_mult; }; struct dwc2_hcd_iso_packet_desc { @@ -264,6 +265,7 @@ struct dwc2_hs_transfer_time { * - USB_ENDPOINT_XFER_ISOC * @ep_is_in: Endpoint direction * @maxp: Value from wMaxPacketSize field of Endpoint Descriptor + * @maxp_mult: Multiplier for maxp * @dev_speed: Device speed. One of the following values: * - USB_SPEED_LOW * - USB_SPEED_FULL @@ -340,6 +342,7 @@ struct dwc2_qh { u8 ep_type; u8 ep_is_in; u16 maxp; + u16 maxp_mult; u8 dev_speed; u8 data_toggle; u8 ping_state; @@ -503,9 +506,14 @@ static inline u8 dwc2_hcd_get_pipe_type(struct dwc2_hcd_pipe_info *pipe) return pipe->pipe_type; } -static inline u16 dwc2_hcd_get_mps(struct dwc2_hcd_pipe_info *pipe) +static inline u16 dwc2_hcd_get_maxp(struct dwc2_hcd_pipe_info *pipe) +{ + return pipe->maxp; +} + +static inline u16 dwc2_hcd_get_maxp_mult(struct dwc2_hcd_pipe_info *pipe) { - return pipe->mps; + return pipe->maxp_mult; } static inline u8 dwc2_hcd_get_dev_addr(struct dwc2_hcd_pipe_info *pipe) @@ -620,12 +628,6 @@ static inline bool dbg_urb(struct urb *urb) static inline bool dbg_perio(void) { return false; } #endif -/* High bandwidth multiplier as encoded in highspeed endpoint descriptors */ -#define dwc2_hb_mult(wmaxpacketsize) (1 + (((wmaxpacketsize) >> 11) & 0x03)) - -/* Packet size for any kind of endpoint descriptor */ -#define dwc2_max_packet(wmaxpacketsize) ((wmaxpacketsize) & 0x07ff) - /* * Returns true if frame1 index is greater than frame2 index. The comparison * is done modulo FRLISTEN_64_SIZE. This accounts for the rollover of the diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c index 88b5dcf3aefc..a052d39b4375 100644 --- a/drivers/usb/dwc2/hcd_intr.c +++ b/drivers/usb/dwc2/hcd_intr.c @@ -1617,8 +1617,9 @@ static void dwc2_hc_ahberr_intr(struct dwc2_hsotg *hsotg, dev_err(hsotg->dev, " Speed: %s\n", speed); - dev_err(hsotg->dev, " Max packet size: %d\n", - dwc2_hcd_get_mps(&urb->pipe_info)); + dev_err(hsotg->dev, " Max packet size: %d (mult %d)\n", + dwc2_hcd_get_maxp(&urb->pipe_info), + dwc2_hcd_get_maxp_mult(&urb->pipe_info)); dev_err(hsotg->dev, " Data buffer length: %d\n", urb->length); dev_err(hsotg->dev, " Transfer buffer: %p, Transfer DMA: %08lx\n", urb->buf, (unsigned long)urb->dma); diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c index ea3aa640c15c..68bbac64b753 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -708,7 +708,7 @@ static void dwc2_hs_pmap_unschedule(struct dwc2_hsotg *hsotg, static int dwc2_uframe_schedule_split(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh) { - int bytecount = dwc2_hb_mult(qh->maxp) * dwc2_max_packet(qh->maxp); + int bytecount = qh->maxp_mult * qh->maxp; int ls_search_slice; int err = 0; int host_interval_in_sched; @@ -1332,7 +1332,7 @@ static int dwc2_check_max_xfer_size(struct dwc2_hsotg *hsotg, u32 max_channel_xfer_size; int status = 0; - max_xfer_size = dwc2_max_packet(qh->maxp) * dwc2_hb_mult(qh->maxp); + max_xfer_size = qh->maxp * qh->maxp_mult; max_channel_xfer_size = hsotg->params.max_transfer_size; if (max_xfer_size > max_channel_xfer_size) { @@ -1517,8 +1517,9 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, u32 prtspd = (hprt & HPRT0_SPD_MASK) >> HPRT0_SPD_SHIFT; bool do_split = (prtspd == HPRT0_SPD_HIGH_SPEED && dev_speed != USB_SPEED_HIGH); - int maxp = dwc2_hcd_get_mps(&urb->pipe_info); - int bytecount = dwc2_hb_mult(maxp) * dwc2_max_packet(maxp); + int maxp = dwc2_hcd_get_maxp(&urb->pipe_info); + int maxp_mult = dwc2_hcd_get_maxp_mult(&urb->pipe_info); + int bytecount = maxp_mult * maxp; char *speed, *type; /* Initialize QH */ @@ -1531,6 +1532,7 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, qh->data_toggle = DWC2_HC_PID_DATA0; qh->maxp = maxp; + qh->maxp_mult = maxp_mult; INIT_LIST_HEAD(&qh->qtd_list); INIT_LIST_HEAD(&qh->qh_list_entry); -- 2.22.0.rc1.311.g5d7573a151-goog

5 years, 12 months

3
2
0 0

✅ PASS: Stable queue: queue-5.1

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 2f7d9d47575e - Linux 5.1.7 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 2f7d9d47575e - Linux 5.1.7 We then merged the patchset with `git am`: sparc64-fix-regression-in-non-hypervisor-tlb-flush-xcall.patch include-linux-bitops.h-sanitize-rotate-primitives.patch xhci-update-bounce-buffer-with-correct-sg-num.patch xhci-use-zu-for-printing-size_t-type.patch xhci-convert-xhci_handshake-to-use-readl_poll_timeout_atomic.patch usb-xhci-avoid-null-pointer-deref-when-bos-field-is-null.patch usbip-usbip_host-fix-bug-sleeping-function-called-from-invalid-context.patch usbip-usbip_host-fix-stub_dev-lock-context-imbalance-regression.patch usb-fix-slab-out-of-bounds-write-in-usb_get_bos_descriptor.patch usb-sisusbvga-fix-oops-in-error-path-of-sisusb_probe.patch usb-add-lpm-quirk-for-surface-dock-gige-adapter.patch usb-rio500-refuse-more-than-one-device-at-a-time.patch usb-rio500-fix-memory-leak-in-close-after-disconnect.patch media-usb-siano-fix-general-protection-fault-in-smsusb.patch media-usb-siano-fix-false-positive-uninitialized-variable-warning.patch media-smsusb-better-handle-optional-alignment.patch brcmfmac-fix-null-pointer-derefence-during-usb-disconnect.patch scsi-zfcp-fix-missing-zfcp_port-reference-put-on-ebusy-from-port_remove.patch scsi-zfcp-fix-to-prevent-port_remove-with-pure-auto-scan-luns-only-sdevs.patch tracing-avoid-memory-leak-in-predicate_parse.patch btrfs-fix-wrong-ctime-and-mtime-of-a-directory-after-log-replay.patch btrfs-fix-race-updating-log-root-item-during-fsync.patch btrfs-fix-fsync-not-persisting-changed-attributes-of-a-directory.patch btrfs-correct-zstd-workspace-manager-lock-to-use-spin_lock_bh.patch btrfs-qgroup-check-bg-while-resuming-relocation-to-avoid-null-pointer-dereference.patch btrfs-incremental-send-fix-file-corruption-when-no-holes-feature-is-enabled.patch btrfs-reloc-also-queue-orphan-reloc-tree-for-cleanup-to-avoid-bug_on.patch iio-dac-ds4422-ds4424-fix-chip-verification.patch iio-adc-ads124-avoid-buffer-overflow.patch iio-adc-modify-npcm-adc-read-reference-voltage.patch iio-adc-ti-ads8688-fix-timestamp-is-not-updated-in-buffer.patch s390-crypto-fix-gcm-aes-s390-selftest-failures.patch s390-crypto-fix-possible-sleep-during-spinlock-aquired.patch kvm-ppc-book3s-hv-xive-do-not-clear-irq-data-of-passthrough-interrupts.patch kvm-ppc-book3s-hv-fix-lockdep-warning-when-entering-guest-on-power9.patch kvm-ppc-book3s-hv-restore-sprg3-in-kvmhv_p9_guest_entry.patch powerpc-perf-fix-mmcra-corruption-by-bhrb_filter.patch powerpc-kexec-fix-loading-of-kernel-initramfs-with-kexec_file_load.patch alsa-line6-assure-canceling-delayed-work-at-disconnection.patch alsa-hda-realtek-set-default-power-save-node-to-0.patch alsa-hda-realtek-improve-the-headset-mic-for-acer-aspire-laptops.patch kvm-s390-do-not-report-unusabled-ids-via-kvm_cap_max_vcpu_id.patch drm-nouveau-i2c-disable-i2c-bus-access-after-fini.patch i2c-mlxcpld-fix-wrong-initialization-order-in-probe.patch i2c-synquacer-fix-synquacer_i2c_doxfer-return-value.patch tty-serial-msm_serial-fix-xon-xoff.patch tty-max310x-fix-external-crystal-register-setup.patch mm-memcg-consider-subtrees-in-memory.events.patch memcg-make-it-work-on-sparse-non-0-node-systems.patch kasan-initialize-tag-to-0xff-in-__kasan_kmalloc.patch kernel-signal.c-trace_signal_deliver-when-signal_group_exit.patch signal-arm64-use-force_sig-not-force_sig_fault-for-sigkill.patch mm-compaction-make-sure-we-isolate-a-valid-pfn.patch arm64-fix-the-arm64_personality-syscall-wrapper-redirection.patch docs-fix-conf.py-for-sphinx-2.0.patch doc-cope-with-the-deprecation-of-autoreporter.patch doc-cope-with-sphinx-logging-deprecations.patch x86-ima-check-efi_runtime_services-before-using.patch ima-fix-wrong-signed-policy-requirement-when-not-appraising.patch ima-show-rules-with-ima_inmask-correctly.patch evm-check-hash-algorithm-passed-to-init_desc.patch clk-imx-imx8mm-fix-int-pll-clk-gate.patch vt-fbcon-deinitialize-resources-in-visual_init-after-failed-memory-allocation.patch serial-sh-sci-disable-dma-for-uart_console.patch staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch staging-wlan-ng-fix-adapter-initialization-failure.patch cifs-fix-memory-leak-of-pneg_inbuf-on-eopnotsupp-ioctl-case.patch cifs-cifs_read_allocate_pages-don-t-iterate-through-whole-page-array-on-enomem.patch revert-lockd-show-pid-of-lockd-for-remote-locks.patch gcc-plugins-fix-build-failures-under-darwin-host.patch drm-tegra-gem-fix-cpu-cache-maintenance-for-bo-s-allocated-using-get_pages.patch drm-vmwgfx-fix-user-space-handle-equal-to-zero.patch drm-vmwgfx-fix-compat-mode-shader-operation.patch drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch drm-sun4i-fix-sun8i-hdmi-phy-clock-initialization.patch drm-sun4i-fix-sun8i-hdmi-phy-configuration-for-148.5-mhz.patch drm-imx-ipuv3-plane-fix-atomic-update-status-query-for-non-plus-i.mx6q.patch drm-fb-helper-generic-call-drm_client_add-after-setup-is-done.patch drm-atomic-wire-file_priv-through-for-property-changes.patch drm-expose-fb_damage_clips-property-to-atomic-aware-user-space-only.patch drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch drm-lease-make-sure-implicit-planes-are-leased.patch drm-cma-helper-fix-drm_gem_cma_free_object.patch revert-x86-build-move-_etext-to-actual-end-of-.text.patch Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_5.1-aa… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_5.1-aa… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_5.1-pp… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_5.1-pp… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_5.1-s390… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_5.1-s390… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_5.1-x86… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_5.1-x86… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] 🚧 ✅ stress: stress-ng [10] ppc64le: Host 1: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] Host 2: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] s390x: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] 🚧 ✅ stress: stress-ng [10] x86_64: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] 🚧 ✅ stress: stress-ng [10] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

5 years, 12 months

1
0
0 0

✅ PASS: Stable queue: queue-4.19

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: e109a984cf38 - Linux 4.19.48 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: e109a984cf38 - Linux 4.19.48 We then merged the patchset with `git am`: sparc64-fix-regression-in-non-hypervisor-tlb-flush-xcall.patch include-linux-bitops.h-sanitize-rotate-primitives.patch xhci-update-bounce-buffer-with-correct-sg-num.patch xhci-use-zu-for-printing-size_t-type.patch xhci-convert-xhci_handshake-to-use-readl_poll_timeout_atomic.patch usb-xhci-avoid-null-pointer-deref-when-bos-field-is-null.patch usbip-usbip_host-fix-bug-sleeping-function-called-from-invalid-context.patch usbip-usbip_host-fix-stub_dev-lock-context-imbalance-regression.patch usb-fix-slab-out-of-bounds-write-in-usb_get_bos_descriptor.patch usb-sisusbvga-fix-oops-in-error-path-of-sisusb_probe.patch usb-add-lpm-quirk-for-surface-dock-gige-adapter.patch usb-rio500-refuse-more-than-one-device-at-a-time.patch usb-rio500-fix-memory-leak-in-close-after-disconnect.patch media-usb-siano-fix-general-protection-fault-in-smsusb.patch media-usb-siano-fix-false-positive-uninitialized-variable-warning.patch media-smsusb-better-handle-optional-alignment.patch brcmfmac-fix-null-pointer-derefence-during-usb-disconnect.patch scsi-zfcp-fix-missing-zfcp_port-reference-put-on-ebusy-from-port_remove.patch scsi-zfcp-fix-to-prevent-port_remove-with-pure-auto-scan-luns-only-sdevs.patch tracing-avoid-memory-leak-in-predicate_parse.patch btrfs-fix-wrong-ctime-and-mtime-of-a-directory-after-log-replay.patch btrfs-fix-race-updating-log-root-item-during-fsync.patch btrfs-fix-fsync-not-persisting-changed-attributes-of-a-directory.patch btrfs-incremental-send-fix-file-corruption-when-no-holes-feature-is-enabled.patch iio-dac-ds4422-ds4424-fix-chip-verification.patch iio-adc-ti-ads8688-fix-timestamp-is-not-updated-in-buffer.patch s390-crypto-fix-gcm-aes-s390-selftest-failures.patch s390-crypto-fix-possible-sleep-during-spinlock-aquired.patch kvm-ppc-book3s-hv-xive-do-not-clear-irq-data-of-passthrough-interrupts.patch powerpc-perf-fix-mmcra-corruption-by-bhrb_filter.patch alsa-line6-assure-canceling-delayed-work-at-disconnection.patch alsa-hda-realtek-set-default-power-save-node-to-0.patch alsa-hda-realtek-improve-the-headset-mic-for-acer-aspire-laptops.patch kvm-s390-do-not-report-unusabled-ids-via-kvm_cap_max_vcpu_id.patch drm-nouveau-i2c-disable-i2c-bus-access-after-fini.patch i2c-mlxcpld-fix-wrong-initialization-order-in-probe.patch i2c-synquacer-fix-synquacer_i2c_doxfer-return-value.patch tty-serial-msm_serial-fix-xon-xoff.patch tty-max310x-fix-external-crystal-register-setup.patch memcg-make-it-work-on-sparse-non-0-node-systems.patch kernel-signal.c-trace_signal_deliver-when-signal_group_exit.patch arm64-fix-the-arm64_personality-syscall-wrapper-redirection.patch docs-fix-conf.py-for-sphinx-2.0.patch doc-cope-with-the-deprecation-of-autoreporter.patch doc-cope-with-sphinx-logging-deprecations.patch ima-show-rules-with-ima_inmask-correctly.patch evm-check-hash-algorithm-passed-to-init_desc.patch vt-fbcon-deinitialize-resources-in-visual_init-after-failed-memory-allocation.patch serial-sh-sci-disable-dma-for-uart_console.patch staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch staging-wlan-ng-fix-adapter-initialization-failure.patch cifs-fix-memory-leak-of-pneg_inbuf-on-eopnotsupp-ioctl-case.patch cifs-cifs_read_allocate_pages-don-t-iterate-through-whole-page-array-on-enomem.patch revert-lockd-show-pid-of-lockd-for-remote-locks.patch gcc-plugins-fix-build-failures-under-darwin-host.patch drm-tegra-gem-fix-cpu-cache-maintenance-for-bo-s-allocated-using-get_pages.patch drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch drm-sun4i-fix-sun8i-hdmi-phy-clock-initialization.patch drm-sun4i-fix-sun8i-hdmi-phy-configuration-for-148.5-mhz.patch drm-rockchip-shutdown-drm-subsystem-on-shutdown.patch drm-lease-make-sure-implicit-planes-are-leased.patch compiler-attributes-add-support-for-__copy-gcc-9.patch include-linux-module.h-copy-__init-__exit-attrs-to-init-cleanup_module.patch revert-x86-build-move-_etext-to-actual-end-of-.text.patch Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] 🚧 ✅ stress: stress-ng [10] ppc64le: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] s390x: Host 1: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] 🚧 ✅ stress: stress-ng [10] Host 2: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] x86_64: Host 1: ✅ Boot test [0] ✅ LTP lite [2] ✅ Loopdev Sanity [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] 🚧 ✅ stress: stress-ng [10] Host 2: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

5 years, 12 months

1
0
0 0

[PATCH] crypto: chacha20poly1305 - fix atomic sleep when using async algorithm

by Eric Biggers

From: Eric Biggers <ebiggers(a)google.com> Clear the CRYPTO_TFM_REQ_MAY_SLEEP flag when the chacha20poly1305 operation is being continued from an async completion callback, since sleeping may not be allowed in that context. This is basically the same bug that was recently fixed in the xts and lrw templates. But, it's always been broken in chacha20poly1305 too. This was found using syzkaller in combination with the updated crypto self-tests which actually test the MAY_SLEEP flag now. Reproducer: python -c 'import socket; socket.socket(socket.AF_ALG, 5, 0).bind( ("aead", "rfc7539(cryptd(chacha20-generic),poly1305-generic)"))' Kernel output: BUG: sleeping function called from invalid context at include/crypto/algapi.h:426 in_atomic(): 1, irqs_disabled(): 0, pid: 1001, name: kworker/2:2 [...] CPU: 2 PID: 1001 Comm: kworker/2:2 Not tainted 5.2.0-rc2 #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-20181126_142135-anatol 04/01/2014 Workqueue: crypto cryptd_queue_worker Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x4d/0x6a lib/dump_stack.c:113 ___might_sleep kernel/sched/core.c:6138 [inline] ___might_sleep.cold.19+0x8e/0x9f kernel/sched/core.c:6095 crypto_yield include/crypto/algapi.h:426 [inline] crypto_hash_walk_done+0xd6/0x100 crypto/ahash.c:113 shash_ahash_update+0x41/0x60 crypto/shash.c:251 shash_async_update+0xd/0x10 crypto/shash.c:260 crypto_ahash_update include/crypto/hash.h:539 [inline] poly_setkey+0xf6/0x130 crypto/chacha20poly1305.c:337 poly_init+0x51/0x60 crypto/chacha20poly1305.c:364 async_done_continue crypto/chacha20poly1305.c:78 [inline] poly_genkey_done+0x15/0x30 crypto/chacha20poly1305.c:369 cryptd_skcipher_complete+0x29/0x70 crypto/cryptd.c:279 cryptd_skcipher_decrypt+0xcd/0x110 crypto/cryptd.c:339 cryptd_queue_worker+0x70/0xa0 crypto/cryptd.c:184 process_one_work+0x1ed/0x420 kernel/workqueue.c:2269 worker_thread+0x3e/0x3a0 kernel/workqueue.c:2415 kthread+0x11f/0x140 kernel/kthread.c:255 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:352 Fixes: 71ebc4d1b27d ("crypto: chacha20poly1305 - Add a ChaCha20-Poly1305 AEAD construction, RFC7539") Cc: <stable(a)vger.kernel.org> # v4.2+ Cc: Martin Willi <martin(a)strongswan.org> Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- crypto/chacha20poly1305.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c index e38a2d61819a7..acbbf010222e3 100644 --- a/crypto/chacha20poly1305.c +++ b/crypto/chacha20poly1305.c @@ -65,6 +65,8 @@ struct chachapoly_req_ctx { unsigned int cryptlen; /* Actual AD, excluding IV */ unsigned int assoclen; + /* request flags, with MAY_SLEEP cleared if needed */ + u32 flags; union { struct poly_req poly; struct chacha_req chacha; @@ -74,8 +76,12 @@ struct chachapoly_req_ctx { static inline void async_done_continue(struct aead_request *req, int err, int (*cont)(struct aead_request *)) { - if (!err) + if (!err) { + struct chachapoly_req_ctx *rctx = aead_request_ctx(req); + + rctx->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; err = cont(req); + } if (err != -EINPROGRESS && err != -EBUSY) aead_request_complete(req, err); @@ -142,7 +148,7 @@ static int chacha_decrypt(struct aead_request *req) dst = scatterwalk_ffwd(rctx->dst, req->dst, req->assoclen); } - skcipher_request_set_callback(&creq->req, aead_request_flags(req), + skcipher_request_set_callback(&creq->req, rctx->flags, chacha_decrypt_done, req); skcipher_request_set_tfm(&creq->req, ctx->chacha); skcipher_request_set_crypt(&creq->req, src, dst, @@ -186,7 +192,7 @@ static int poly_tail(struct aead_request *req) memcpy(&preq->tail.cryptlen, &len, sizeof(len)); sg_set_buf(preq->src, &preq->tail, sizeof(preq->tail)); - ahash_request_set_callback(&preq->req, aead_request_flags(req), + ahash_request_set_callback(&preq->req, rctx->flags, poly_tail_done, req); ahash_request_set_tfm(&preq->req, ctx->poly); ahash_request_set_crypt(&preq->req, preq->src, @@ -217,7 +223,7 @@ static int poly_cipherpad(struct aead_request *req) sg_init_table(preq->src, 1); sg_set_buf(preq->src, &preq->pad, padlen); - ahash_request_set_callback(&preq->req, aead_request_flags(req), + ahash_request_set_callback(&preq->req, rctx->flags, poly_cipherpad_done, req); ahash_request_set_tfm(&preq->req, ctx->poly); ahash_request_set_crypt(&preq->req, preq->src, NULL, padlen); @@ -248,7 +254,7 @@ static int poly_cipher(struct aead_request *req) sg_init_table(rctx->src, 2); crypt = scatterwalk_ffwd(rctx->src, crypt, req->assoclen); - ahash_request_set_callback(&preq->req, aead_request_flags(req), + ahash_request_set_callback(&preq->req, rctx->flags, poly_cipher_done, req); ahash_request_set_tfm(&preq->req, ctx->poly); ahash_request_set_crypt(&preq->req, crypt, NULL, rctx->cryptlen); @@ -278,7 +284,7 @@ static int poly_adpad(struct aead_request *req) sg_init_table(preq->src, 1); sg_set_buf(preq->src, preq->pad, padlen); - ahash_request_set_callback(&preq->req, aead_request_flags(req), + ahash_request_set_callback(&preq->req, rctx->flags, poly_adpad_done, req); ahash_request_set_tfm(&preq->req, ctx->poly); ahash_request_set_crypt(&preq->req, preq->src, NULL, padlen); @@ -302,7 +308,7 @@ static int poly_ad(struct aead_request *req) struct poly_req *preq = &rctx->u.poly; int err; - ahash_request_set_callback(&preq->req, aead_request_flags(req), + ahash_request_set_callback(&preq->req, rctx->flags, poly_ad_done, req); ahash_request_set_tfm(&preq->req, ctx->poly); ahash_request_set_crypt(&preq->req, req->src, NULL, rctx->assoclen); @@ -329,7 +335,7 @@ static int poly_setkey(struct aead_request *req) sg_init_table(preq->src, 1); sg_set_buf(preq->src, rctx->key, sizeof(rctx->key)); - ahash_request_set_callback(&preq->req, aead_request_flags(req), + ahash_request_set_callback(&preq->req, rctx->flags, poly_setkey_done, req); ahash_request_set_tfm(&preq->req, ctx->poly); ahash_request_set_crypt(&preq->req, preq->src, NULL, sizeof(rctx->key)); @@ -353,7 +359,7 @@ static int poly_init(struct aead_request *req) struct poly_req *preq = &rctx->u.poly; int err; - ahash_request_set_callback(&preq->req, aead_request_flags(req), + ahash_request_set_callback(&preq->req, rctx->flags, poly_init_done, req); ahash_request_set_tfm(&preq->req, ctx->poly); @@ -391,7 +397,7 @@ static int poly_genkey(struct aead_request *req) chacha_iv(creq->iv, req, 0); - skcipher_request_set_callback(&creq->req, aead_request_flags(req), + skcipher_request_set_callback(&creq->req, rctx->flags, poly_genkey_done, req); skcipher_request_set_tfm(&creq->req, ctx->chacha); skcipher_request_set_crypt(&creq->req, creq->src, creq->src, @@ -431,7 +437,7 @@ static int chacha_encrypt(struct aead_request *req) dst = scatterwalk_ffwd(rctx->dst, req->dst, req->assoclen); } - skcipher_request_set_callback(&creq->req, aead_request_flags(req), + skcipher_request_set_callback(&creq->req, rctx->flags, chacha_encrypt_done, req); skcipher_request_set_tfm(&creq->req, ctx->chacha); skcipher_request_set_crypt(&creq->req, src, dst, @@ -449,6 +455,7 @@ static int chachapoly_encrypt(struct aead_request *req) struct chachapoly_req_ctx *rctx = aead_request_ctx(req); rctx->cryptlen = req->cryptlen; + rctx->flags = aead_request_flags(req); /* encrypt call chain: * - chacha_encrypt/done() @@ -470,6 +477,7 @@ static int chachapoly_decrypt(struct aead_request *req) struct chachapoly_req_ctx *rctx = aead_request_ctx(req); rctx->cryptlen = req->cryptlen - POLY1305_DIGEST_SIZE; + rctx->flags = aead_request_flags(req); /* decrypt call chain: * - poly_genkey/done() -- 2.21.0

5 years, 12 months

2
1
0 0

[PATCH] crypto: lrw - use correct alignmask

by Eric Biggers

From: Eric Biggers <ebiggers(a)google.com> Commit c778f96bf347 ("crypto: lrw - Optimize tweak computation") incorrectly reduced the alignmask of LRW instances from '__alignof__(u64) - 1' to '__alignof__(__be32) - 1'. However, xor_tweak() and setkey() assume that the data and key, respectively, are aligned to 'be128', which has u64 alignment. Fix the alignmask to be at least '__alignof__(be128) - 1'. Fixes: c778f96bf347 ("crypto: lrw - Optimize tweak computation") Cc: <stable(a)vger.kernel.org> # v4.20+ Cc: Ondrej Mosnacek <omosnace(a)redhat.com> Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- crypto/lrw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/lrw.c b/crypto/lrw.c index fa302f3f161e0..b43ea285b8c79 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -388,7 +388,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.base.cra_priority = alg->base.cra_priority; inst->alg.base.cra_blocksize = LRW_BLOCK_SIZE; inst->alg.base.cra_alignmask = alg->base.cra_alignmask | - (__alignof__(__be32) - 1); + (__alignof__(be128) - 1); inst->alg.ivsize = LRW_BLOCK_SIZE; inst->alg.min_keysize = crypto_skcipher_alg_min_keysize(alg) + -- 2.22.0.rc1.257.g3120a18244-goog

5 years, 12 months

2
1
0 0

[PATCH] crypto: ghash - fix unaligned memory access in ghash_setkey()

by Eric Biggers

From: Eric Biggers <ebiggers(a)google.com> Changing ghash_mod_init() to be subsys_initcall made it start running before the alignment fault handler has been installed on ARM. In kernel builds where the keys in the ghash test vectors happened to be misaligned in the kernel image, this exposed the longstanding bug that ghash_setkey() is incorrectly casting the key buffer (which can have any alignment) to be128 for passing to gf128mul_init_4k_lle(). Fix this by memcpy()ing the key to a temporary buffer. Don't fix it by setting an alignmask on the algorithm instead because that would unnecessarily force alignment of the data too. Fixes: 2cdc6899a88e ("crypto: ghash - Add GHASH digest algorithm for GCM") Reported-by: Peter Robinson <pbrobinson(a)gmail.com> Cc: stable(a)vger.kernel.org Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- crypto/ghash-generic.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c index e6307935413c1..c8a347798eae6 100644 --- a/crypto/ghash-generic.c +++ b/crypto/ghash-generic.c @@ -34,6 +34,7 @@ static int ghash_setkey(struct crypto_shash *tfm, const u8 *key, unsigned int keylen) { struct ghash_ctx *ctx = crypto_shash_ctx(tfm); + be128 k; if (keylen != GHASH_BLOCK_SIZE) { crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); @@ -42,7 +43,12 @@ static int ghash_setkey(struct crypto_shash *tfm, if (ctx->gf128) gf128mul_free_4k(ctx->gf128); - ctx->gf128 = gf128mul_init_4k_lle((be128 *)key); + + BUILD_BUG_ON(sizeof(k) != GHASH_BLOCK_SIZE); + memcpy(&k, key, GHASH_BLOCK_SIZE); /* avoid violating alignment rules */ + ctx->gf128 = gf128mul_init_4k_lle(&k); + memzero_explicit(&k, GHASH_BLOCK_SIZE); + if (!ctx->gf128) return -ENOMEM; -- 2.22.0.rc1.257.g3120a18244-goog

5 years, 12 months

4
4
0 0

[PATCH] arm64 sha2-ce finup: correct digest for empty data

by Elena Petrova

The sha256-ce finup implementation for ARM64 produces wrong digest for empty input (len=0). Expected: the actual digest, result: initial value of SHA internal state. The error is in sha256_ce_finup: for empty data `finalize` will be 1, so the code is relying on sha2_ce_transform to make the final round. However, in sha256_base_do_update, the block function will not be called when len == 0. Fix it by setting finalize to 0 if data is empty. Fixes: 03802f6a80b3a ("crypto: arm64/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer") Cc: stable(a)vger.kernel.org Signed-off-by: Elena Petrova <lenaptr(a)google.com> --- arch/arm64/crypto/sha2-ce-glue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c index a725997e55f2..6a5ade974a35 100644 --- a/arch/arm64/crypto/sha2-ce-glue.c +++ b/arch/arm64/crypto/sha2-ce-glue.c @@ -60,7 +60,7 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out) { struct sha256_ce_state *sctx = shash_desc_ctx(desc); - bool finalize = !sctx->sst.count && !(len % SHA256_BLOCK_SIZE); + bool finalize = !sctx->sst.count && !(len % SHA256_BLOCK_SIZE) && len; if (!crypto_simd_usable()) { if (len) -- 2.22.0.rc1.257.g3120a18244-goog

5 years, 12 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror