diff -u linux-intel-iotg-5.15.0/debian.intel-iotg/changelog linux-intel-iotg-5.15.0/debian.intel-iotg/changelog --- linux-intel-iotg-5.15.0/debian.intel-iotg/changelog +++ linux-intel-iotg-5.15.0/debian.intel-iotg/changelog @@ -1,3 +1,17 @@ +linux-intel-iotg (5.15.0-1055.61) jammy; urgency=medium + + * jammy/linux-intel-iotg: 5.15.0-1055.61 -proposed tracker (LP: #2061492) + + [ Ubuntu: 5.15.0-105.115 ] + + * jammy/linux: 5.15.0-105.115 -proposed tracker (LP: #2061372) + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // CIFS + stopped working/is unstable with kernel update to 5.15.0-102.112 + (LP: #2060780) + - smb3: Replace smb2pdu 1-element arrays with flex-arrays + + -- Roxana Nicolescu Mon, 15 Apr 2024 21:12:03 +0200 + linux-intel-iotg (5.15.0-1053.59) jammy; urgency=medium * jammy/linux-intel-iotg: 5.15.0-1053.59 -proposed tracker (LP: #2059670) diff -u linux-intel-iotg-5.15.0/debian.intel-iotg/tracking-bug linux-intel-iotg-5.15.0/debian.intel-iotg/tracking-bug --- linux-intel-iotg-5.15.0/debian.intel-iotg/tracking-bug +++ linux-intel-iotg-5.15.0/debian.intel-iotg/tracking-bug @@ -1 +1 @@ -2059670 s2024.03.04-1 +2061492 s2024.03.04-2 diff -u linux-intel-iotg-5.15.0/debian.master/changelog linux-intel-iotg-5.15.0/debian.master/changelog --- linux-intel-iotg-5.15.0/debian.master/changelog +++ linux-intel-iotg-5.15.0/debian.master/changelog @@ -1,3 +1,14 @@ +linux (5.15.0-105.115) jammy; urgency=medium + + * jammy/linux: 5.15.0-105.115 -proposed tracker (LP: #2061372) + + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // CIFS + stopped working/is unstable with kernel update to 5.15.0-102.112 + (LP: #2060780) + - smb3: Replace smb2pdu 1-element arrays with flex-arrays + + -- Roxana Nicolescu Mon, 15 Apr 2024 10:38:15 +0200 + linux (5.15.0-103.113) jammy; urgency=medium * jammy/linux: 5.15.0-103.113 -proposed tracker (LP: #2059683) diff -u linux-intel-iotg-5.15.0/debian.master/tracking-bug linux-intel-iotg-5.15.0/debian.master/tracking-bug --- linux-intel-iotg-5.15.0/debian.master/tracking-bug +++ linux-intel-iotg-5.15.0/debian.master/tracking-bug @@ -1 +1 @@ -2059683 s2024.03.04-1 +2061372 s2024.03.04-2 diff -u linux-intel-iotg-5.15.0/debian/changelog linux-intel-iotg-5.15.0/debian/changelog --- linux-intel-iotg-5.15.0/debian/changelog +++ linux-intel-iotg-5.15.0/debian/changelog @@ -1,3 +1,17 @@ +linux-intel-iotg (5.15.0-1055.61) jammy; urgency=medium + + * jammy/linux-intel-iotg: 5.15.0-1055.61 -proposed tracker (LP: #2061492) + + [ Ubuntu: 5.15.0-105.115 ] + + * jammy/linux: 5.15.0-105.115 -proposed tracker (LP: #2061372) + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // CIFS + stopped working/is unstable with kernel update to 5.15.0-102.112 + (LP: #2060780) + - smb3: Replace smb2pdu 1-element arrays with flex-arrays + + -- Roxana Nicolescu Mon, 15 Apr 2024 21:12:03 +0200 + linux-intel-iotg (5.15.0-1053.59) jammy; urgency=medium * jammy/linux-intel-iotg: 5.15.0-1053.59 -proposed tracker (LP: #2059670) diff -u linux-intel-iotg-5.15.0/debian/control linux-intel-iotg-5.15.0/debian/control --- linux-intel-iotg-5.15.0/debian/control +++ linux-intel-iotg-5.15.0/debian/control @@ -61,7 +61,7 @@ XS-Testsuite: autopkgtest #XS-Testsuite-Depends: gcc-4.7 binutils -Package: linux-intel-iotg-headers-5.15.0-1053 +Package: linux-intel-iotg-headers-5.15.0-1055 Build-Profiles: Architecture: all Multi-Arch: foreign @@ -71,7 +71,7 @@ Description: Header files related to Linux kernel version 5.15.0 This package provides kernel header files for version 5.15.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-intel-iotg-headers-5.15.0-1053/debian.README.gz for details + /usr/share/doc/linux-intel-iotg-headers-5.15.0-1055/debian.README.gz for details Package: linux-intel-iotg-tools-common Build-Profiles: @@ -85,18 +85,18 @@ version locked tools (such as perf and x86_energy_perf_policy) for version 5.15.0. -Package: linux-intel-iotg-tools-5.15.0-1053 +Package: linux-intel-iotg-tools-5.15.0-1055 Build-Profiles: Architecture: amd64 Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 5.15.0-1053 +Description: Linux kernel version specific tools for version 5.15.0-1055 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 5.15.0-1053 on + version 5.15.0-1055 on 64 bit x86. - You probably want to install linux-tools-5.15.0-1053-. + You probably want to install linux-tools-5.15.0-1055-. Package: linux-intel-iotg-cloud-tools-common Build-Profiles: @@ -109,17 +109,17 @@ This package provides the architecture independent parts for kernel version locked tools for cloud tools for version 5.15.0. -Package: linux-intel-iotg-cloud-tools-5.15.0-1053 +Package: linux-intel-iotg-cloud-tools-5.15.0-1055 Build-Profiles: Architecture: amd64 Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common -Description: Linux kernel version specific cloud tools for version 5.15.0-1053 +Description: Linux kernel version specific cloud tools for version 5.15.0-1055 This package provides the architecture dependant parts for kernel - version locked tools for cloud tools for version 5.15.0-1053 on + version locked tools for cloud tools for version 5.15.0-1055 on 64 bit x86. - You probably want to install linux-cloud-tools-5.15.0-1053-. + You probably want to install linux-cloud-tools-5.15.0-1055-. Package: linux-intel-iotg-tools-host Build-Profiles: @@ -132,17 +132,17 @@ This package provides kernel tools useful for VM hosts. -Package: linux-image-unsigned-5.15.0-1053-intel-iotg +Package: linux-image-unsigned-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: kernel Priority: optional Provides: linux-image, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64], ${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.15.0-1053-intel-iotg +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.15.0-1055-intel-iotg Recommends: grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64], initramfs-tools | linux-initramfs-tool Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] -Conflicts: linux-image-5.15.0-1053-intel-iotg -Suggests: fdutils, linux-doc | linux-intel-iotg-source-5.15.0, linux-intel-iotg-tools, linux-headers-5.15.0-1053-intel-iotg, linux-modules-extra-5.15.0-1053-intel-iotg +Conflicts: linux-image-5.15.0-1055-intel-iotg +Suggests: fdutils, linux-doc | linux-intel-iotg-source-5.15.0, linux-intel-iotg-tools, linux-headers-5.15.0-1055-intel-iotg, linux-modules-extra-5.15.0-1055-intel-iotg Description: Linux kernel image for version 5.15.0 on 64 bit x86 SMP This package contains the unsigned Linux kernel image for version 5.15.0 on 64 bit x86 SMP. @@ -155,12 +155,12 @@ the linux-intel-iotg meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-5.15.0-1053-intel-iotg +Package: linux-modules-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1053-intel-iotg | linux-image-unsigned-5.15.0-1053-intel-iotg +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1055-intel-iotg | linux-image-unsigned-5.15.0-1055-intel-iotg Built-Using: ${linux:BuiltUsing} Description: Linux kernel extra modules for version 5.15.0 on 64 bit x86 SMP Contains the corresponding System.map file, the modules built by the @@ -175,12 +175,12 @@ the linux-intel-iotg meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-extra-5.15.0-1053-intel-iotg +Package: linux-modules-extra-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1053-intel-iotg | linux-image-unsigned-5.15.0-1053-intel-iotg, wireless-regdb +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1055-intel-iotg | linux-image-unsigned-5.15.0-1055-intel-iotg, wireless-regdb Description: Linux kernel extra modules for version 5.15.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 5.15.0 on 64 bit x86 SMP. @@ -197,21 +197,21 @@ the linux-intel-iotg meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-5.15.0-1053-intel-iotg +Package: linux-headers-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-intel-iotg-headers-5.15.0-1053, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-intel-iotg-headers-5.15.0-1055, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 5.15.0 on 64 bit x86 SMP This package provides kernel header files for version 5.15.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-5.15.0-1053/debian.README.gz for details. + /usr/share/doc/linux-headers-5.15.0-1055/debian.README.gz for details. -Package: linux-image-unsigned-5.15.0-1053-intel-iotg-dbgsym +Package: linux-image-unsigned-5.15.0-1055-intel-iotg-dbgsym Build-Profiles: Architecture: amd64 Section: devel @@ -228,30 +228,30 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-5.15.0-1053-intel-iotg +Package: linux-tools-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-intel-iotg-tools-5.15.0-1053 -Description: Linux kernel version specific tools for version 5.15.0-1053 +Depends: ${misc:Depends}, linux-intel-iotg-tools-5.15.0-1055 +Description: Linux kernel version specific tools for version 5.15.0-1055 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 5.15.0-1053 on + version 5.15.0-1055 on 64 bit x86. -Package: linux-cloud-tools-5.15.0-1053-intel-iotg +Package: linux-cloud-tools-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-intel-iotg-cloud-tools-5.15.0-1053 -Description: Linux kernel version specific cloud tools for version 5.15.0-1053 +Depends: ${misc:Depends}, linux-intel-iotg-cloud-tools-5.15.0-1055 +Description: Linux kernel version specific cloud tools for version 5.15.0-1055 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 5.15.0-1053 on + version locked tools for cloud for version 5.15.0-1055 on 64 bit x86. -Package: linux-buildinfo-5.15.0-1053-intel-iotg +Package: linux-buildinfo-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: kernel @@ -265,18 +265,18 @@ You likely do not want to install this package. -Package: linux-modules-iwlwifi-5.15.0-1053-intel-iotg +Package: linux-modules-iwlwifi-5.15.0-1055-intel-iotg Build-Profiles: Architecture: amd64 Section: kernel Priority: optional Depends: ${misc:Depends}, - linux-image-5.15.0-1053-intel-iotg | linux-image-unsigned-5.15.0-1053-intel-iotg, + linux-image-5.15.0-1055-intel-iotg | linux-image-unsigned-5.15.0-1055-intel-iotg, Built-Using: ${linux:BuiltUsing} -Description: Linux kernel iwlwifi modules for version 5.15.0-1053 +Description: Linux kernel iwlwifi modules for version 5.15.0-1055 This package provides the Linux kernel iwlwifi modules for version - 5.15.0-1053. + 5.15.0-1055. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-iwlwifi-intel-iotg* meta-packages, diff -u linux-intel-iotg-5.15.0/fs/cifs/smb2misc.c linux-intel-iotg-5.15.0/fs/cifs/smb2misc.c --- linux-intel-iotg-5.15.0/fs/cifs/smb2misc.c +++ linux-intel-iotg-5.15.0/fs/cifs/smb2misc.c @@ -113,7 +113,7 @@ } else if (nc_offset + 1 == non_ctxlen) { cifs_dbg(FYI, "no SPNEGO security blob in negprot rsp\n"); size_of_pad_before_neg_ctxts = 0; - } else if (non_ctxlen == SMB311_NEGPROT_BASE_SIZE) + } else if (non_ctxlen == SMB311_NEGPROT_BASE_SIZE + 1) /* has padding, but no SPNEGO blob */ size_of_pad_before_neg_ctxts = nc_offset - non_ctxlen + 1; else diff -u linux-intel-iotg-5.15.0/fs/cifs/smb2ops.c linux-intel-iotg-5.15.0/fs/cifs/smb2ops.c --- linux-intel-iotg-5.15.0/fs/cifs/smb2ops.c +++ linux-intel-iotg-5.15.0/fs/cifs/smb2ops.c @@ -5828,7 +5828,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5850,7 +5850,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5871,7 +5871,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5892,7 +5892,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5913,7 +5913,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5934,7 +5934,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5955,7 +5955,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, diff -u linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.c linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.c --- linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.c +++ linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.c @@ -1327,7 +1327,7 @@ /* Testing shows that buffer offset must be at location of Buffer[0] */ req->SecurityBufferOffset = - cpu_to_le16(sizeof(struct smb2_sess_setup_req) - 1 /* pad */); + cpu_to_le16(sizeof(struct smb2_sess_setup_req)); req->SecurityBufferLength = cpu_to_le16(sess_data->iov[1].iov_len); memset(&rqst, 0, sizeof(struct smb_rqst)); @@ -1826,8 +1826,7 @@ iov[0].iov_len = total_len - 1; /* Testing shows that buffer offset must be at location of Buffer[0] */ - req->PathOffset = cpu_to_le16(sizeof(struct smb2_tree_connect_req) - - 1 /* pad */); + req->PathOffset = cpu_to_le16(sizeof(struct smb2_tree_connect_req)); req->PathLength = cpu_to_le16(unc_path_len - 2); iov[1].iov_base = unc_path; iov[1].iov_len = unc_path_len; @@ -4748,7 +4747,7 @@ memcpy(bufptr, &asteriks, len); req->FileNameOffset = - cpu_to_le16(sizeof(struct smb2_query_directory_req) - 1); + cpu_to_le16(sizeof(struct smb2_query_directory_req)); req->FileNameLength = cpu_to_le16(len); /* * BB could be 30 bytes or so longer if we used SMB2 specific @@ -4945,7 +4944,7 @@ req->AdditionalInformation = cpu_to_le32(additional_info); req->BufferOffset = - cpu_to_le16(sizeof(struct smb2_set_info_req) - 1); + cpu_to_le16(sizeof(struct smb2_set_info_req)); req->BufferLength = cpu_to_le32(*size); memcpy(req->Buffer, *data, *size); @@ -5177,9 +5176,9 @@ req->VolatileFileId = volatile_fid; /* 1 for pad */ req->InputBufferOffset = - cpu_to_le16(sizeof(struct smb2_query_info_req) - 1); + cpu_to_le16(sizeof(struct smb2_query_info_req)); req->OutputBufferLength = cpu_to_le32( - outbuf_len + sizeof(struct smb2_query_info_rsp) - 1); + outbuf_len + sizeof(struct smb2_query_info_rsp)); iov->iov_base = (char *)req; iov->iov_len = total_len; diff -u linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.h linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.h --- linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.h +++ linux-intel-iotg-5.15.0/fs/cifs/smb2pdu.h @@ -218,7 +218,7 @@ __le16 StructureSize; __le16 Reserved; /* MBZ */ __le32 ByteCount; /* even if zero, at least one byte follows */ - __u8 ErrorData[1]; /* variable length */ + __u8 ErrorData[]; /* variable length */ } __packed; #define SYMLINK_ERROR_TAG 0x4c4d5953 @@ -487,7 +487,7 @@ __le16 SecurityBufferOffset; __le16 SecurityBufferLength; __le32 NegotiateContextOffset; /* Pre:SMB3.1.1 was reserved/ignored */ - __u8 Buffer[1]; /* variable length GSS security buffer */ + __u8 Buffer[]; /* variable length GSS security buffer */ } __packed; /* Flags */ @@ -504,7 +504,7 @@ __le16 SecurityBufferOffset; __le16 SecurityBufferLength; __u64 PreviousSessionId; - __u8 Buffer[1]; /* variable length GSS security buffer */ + __u8 Buffer[]; /* variable length GSS security buffer */ } __packed; /* Currently defined SessionFlags */ @@ -517,7 +517,7 @@ __le16 SessionFlags; __le16 SecurityBufferOffset; __le16 SecurityBufferLength; - __u8 Buffer[1]; /* variable length GSS security buffer */ + __u8 Buffer[]; /* variable length GSS security buffer */ } __packed; struct smb2_logoff_req { @@ -543,7 +543,7 @@ __le16 Flags; /* Reserved MBZ for dialects prior to SMB3.1.1 */ __le16 PathOffset; __le16 PathLength; - __u8 Buffer[1]; /* variable length */ + __u8 Buffer[]; /* variable length */ } __packed; /* See MS-SMB2 section 2.2.9.2 */ @@ -852,7 +852,7 @@ __u64 VolatileFileId; /* opaque endianness */ __le32 CreateContextsOffset; __le32 CreateContextsLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct create_context { @@ -1313,7 +1313,7 @@ __le32 RemainingBytes; __le16 ReadChannelInfoOffset; __le16 ReadChannelInfoLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* Read flags */ @@ -1328,7 +1328,7 @@ __le32 DataLength; __le32 DataRemaining; __u32 Flags; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* For write request Flags field below the following flags are defined: */ @@ -1348,7 +1348,7 @@ __le16 WriteChannelInfoOffset; __le16 WriteChannelInfoLength; __le32 Flags; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_write_rsp { @@ -1359,7 +1359,7 @@ __le32 DataLength; __le32 DataRemaining; __u32 Reserved2; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* notify flags */ @@ -1395,7 +1395,7 @@ __le16 StructureSize; /* Must be 9 */ __le16 OutputBufferOffset; __le32 OutputBufferLength; - __u8 Buffer[1]; /* array of file notify structs */ + __u8 Buffer[]; /* array of file notify structs */ } __packed; #define SMB2_LOCKFLAG_SHARED_LOCK 0x0001 @@ -1422,7 +1422,10 @@ __u64 PersistentFileId; /* opaque endianness */ __u64 VolatileFileId; /* opaque endianness */ /* Followed by at least one */ - struct smb2_lock_element locks[1]; + union { + struct smb2_lock_element lock; + DECLARE_FLEX_ARRAY(struct smb2_lock_element, locks); + }; } __packed; struct smb2_lock_rsp { @@ -1478,7 +1481,7 @@ __le16 FileNameOffset; __le16 FileNameLength; __le32 OutputBufferLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_query_directory_rsp { @@ -1486,7 +1489,7 @@ __le16 StructureSize; /* Must be 9 */ __le16 OutputBufferOffset; __le32 OutputBufferLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* Possible InfoType values */ @@ -1527,7 +1530,7 @@ __le32 Flags; __u64 PersistentFileId; /* opaque endianness */ __u64 VolatileFileId; /* opaque endianness */ - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_query_info_rsp { @@ -1535,7 +1538,7 @@ __le16 StructureSize; /* Must be 9 */ __le16 OutputBufferOffset; __le32 OutputBufferLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* @@ -1558,7 +1561,7 @@ __le32 AdditionalInformation; __u64 PersistentFileId; /* opaque endianness */ __u64 VolatileFileId; /* opaque endianness */ - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_set_info_rsp { @@ -1761,7 +1764,10 @@ __le32 Mode; __le32 AlignmentRequirement; __le32 FileNameLength; - char FileName[1]; + union { + char __pad; /* Legacy structure padding */ + DECLARE_FLEX_ARRAY(char, FileName); + }; } __packed; /* level 18 Query */ struct smb2_file_eof_info { /* encoding of request for level 10 */