git/linux-nf
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git synced 2026-04-03 23:38:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,429,105 Commits 1 Branch 943 Tags
main
Commit Graph

36 Commits

Author SHA1 Message Date
Johan Hovold
163cc462de gpib: lpvo_usb: fix unintended binding of FTDI 8U232AM devices 
The LPVO USB GPIB adapter apparently uses an FTDI 8U232AM with the
default PID, but this device id is already handled by the ftdi_sio
serial driver.

Stop binding to the default PID to avoid breaking existing setups with
FTDI 8U232AM.

Anyone using this driver should blacklist the ftdi_sio driver and add
the device id manually through sysfs (e.g. using udev rules).

Fixes: fce79512a9 ("staging: gpib: Add LPVO DIY USB GPIB driver")
Fixes: e6ab504633 ("staging: gpib: Destage gpib")
Cc: Dave Penkler <dpenkler@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260305151729.10501-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-03-11 16:23:32 +01:00
Linus Torvalds
32a92f8c89 Convert more 'alloc_obj' cases to default GFP_KERNEL arguments 
This converts some of the visually simpler cases that have been split
over multiple lines.  I only did the ones that are easy to verify the
resulting diff by having just that final GFP_KERNEL argument on the next
line.

Somebody should probably do a proper coccinelle script for this, but for
me the trivial script actually resulted in an assertion failure in the
middle of the script.  I probably had made it a bit _too_ trivial.

So after fighting that far a while I decided to just do some of the
syntactically simpler cases with variations of the previous 'sed'
scripts.

The more syntactically complex multi-line cases would mostly really want
whitespace cleanup anyway.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 2026-02-21 20:03:00 -08:00
Linus Torvalds
bf4afc53b7 Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 
This was done entirely with mindless brute force, using

    git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
        xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'

to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.

Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.

For the same reason the 'flex' versions will be done as a separate
conversion.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 2026-02-21 17:09:51 -08:00
Kees Cook
69050f8d6d treewide: Replace kmalloc with kmalloc_obj for non-scalar types 
This is the result of running the Coccinelle script from
scripts/coccinelle/api/kmalloc_objs.cocci. The script is designed to
avoid scalar types (which need careful case-by-case checking), and
instead replace kmalloc-family calls that allocate struct or union
object instances:

Single allocations:	kmalloc(sizeof(TYPE), ...)
are replaced with:	kmalloc_obj(TYPE, ...)

Array allocations:	kmalloc_array(COUNT, sizeof(TYPE), ...)
are replaced with:	kmalloc_objs(TYPE, COUNT, ...)

Flex array allocations:	kmalloc(struct_size(PTR, FAM, COUNT), ...)
are replaced with:	kmalloc_flex(*PTR, FAM, COUNT, ...)

(where TYPE may also be *VAR)

The resulting allocations no longer return "void *", instead returning
"TYPE *".

Signed-off-by: Kees Cook <kees@kernel.org>
 2026-02-21 01:02:28 -08:00
Dominik Karol Piątkowski
3df1fd31f6 gpib: tnt4882: Unify *allocate_private usage 
Use the return value of tnt4882_allocate_private in calling code as
early return value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-28-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:08 +01:00
Dominik Karol Piątkowski
9effb86530 gpib: tnt4882: Unify *allocate_private return value 
Return -ENOMEM instead of -1 in tnt4882_allocate_private in case of
memory allocation failure.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-27-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:08 +01:00
Dominik Karol Piątkowski
a16ad9b68b gpib: tnt4882: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in tnt4882_allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-26-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:08 +01:00
Dominik Karol Piątkowski
c2a9f77c0e gpib: pc2: Unify *allocate_private usage 
Use the return value of allocate_private in calling code as early return
value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-25-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:08 +01:00
Dominik Karol Piątkowski
68de22e994 gpib: pc2: Unify *allocate_private return value 
Return -ENOMEM instead of -1 in allocate_private in case of memory
allocation failure.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-24-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:08 +01:00
Dominik Karol Piątkowski
6e6dc3f7c0 gpib: pc2: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-23-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:08 +01:00
Dominik Karol Piątkowski
78047416f8 gpib: ni_usb: Fix the *allocate_private retval check 
Change

if (retval < 0)
        return retval;

into

if (retval)
        return retval;

as it is more fitting in this case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-22-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:08 +01:00
Dominik Karol Piątkowski
64900aa878 gpib: ni_usb: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in ni_usb_allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-21-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
11f1b16916 gpib: ines: Unify *allocate_private usage 
Use the return value of ines_allocate_private in calling code as early
return value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-20-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
24d4d06acb gpib: ines: Unify *allocate_private return value 
Return -ENOMEM instead of -1 in ines_allocate_private in case of memory
allocation failure.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-19-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
b3d3ab10b9 gpib: ines: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in ines_allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-18-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
3f5d831600 gpib: hp_82341: Unify *allocate_private usage 
Use the return value of hp_82341_allocate_private in calling code as
early return value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-17-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
c0790b6c90 gpib: hp_82335: Unify *allocate_private usage 
Use the return value of hp82335_allocate_private in calling code as
early return value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-16-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
0a1e9b99d8 gpib: hp_82335: Unify *allocate_private return value 
Return -ENOMEM instead of -1 in hp82335_allocate_private in case of
memory allocation failure.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-15-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
1dd1bc4d79 gpib: gpio: Unify *allocate_private usage 
Use the return value of allocate_private in calling code as early return
value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-14-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
ad161c8b12 gpib: gpio: Unify *allocate_private return value 
Return -ENOMEM instead of -1 in allocate_private in case of memory
allocation failure.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-13-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
c47b98c476 gpib: fmh_gpib: Fix the *allocate_private retval check 
Change

if (retval < 0)
        return retval;

into

if (retval)
        return retval;

as it is more fitting in this case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-12-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:07 +01:00
Dominik Karol Piątkowski
578481c343 gpib: fmh_gpib: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in fmh_gpib_allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-11-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
f9d2893ff9 gpib: eastwood: Fix the *allocate_private retval check 
Change

if (retval < 0)
        return retval;

into

if (retval)
        return retval;

as it is more fitting in this case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-10-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
59e2e6b562 gpib: eastwood: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in fluke_allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-9-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
908206d82e gpib: cec: Unify *allocate_private usage 
Use the return value of cec_allocate_private in calling code as early
return value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-8-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
b47077a4c0 gpib: cec: Unify *allocate_private return value 
Return -ENOMEM instead of -1 in cec_allocate_private in case of memory
allocation failure.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-7-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
258dd4c7dd gpib: cec: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in cec_allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-6-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
0ea001af4e gpib: cb7210: Unify *allocate_private usage 
Use the return value of cb7210_allocate_private in calling code as
early return value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-5-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
1ec138c8db gpib: cb7210: Replace kmalloc/memset to kzalloc in *allocate_private 
Replace kmalloc/memset pair to kzalloc in cb7210_allocate_private.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-4-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
048b9f4435 gpib: agilent_82357a: Fix the *allocate_private retval check 
Change

if (retval < 0)
	return retval;

into

if (retval)
	return retval;

as it is more fitting in this case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-3-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Dominik Karol Piątkowski
c9627831fb gpib: agilent_82350b: Unify *allocate_private usage 
Use the return value of agilent_82350b_allocate_private in calling code
as early return value in case of error.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
Link: https://patch.msgid.link/20260116174647.317256-2-dominik.karol.piatkowski@protonmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-27 16:04:06 +01:00
Zilin Guan
b89921eed8 gpib: Fix memory leak in ni_usb_init() 
In ni_usb_init(), if ni_usb_setup_init() fails, the function returns
-EFAULT without freeing the allocated writes buffer, leading to a
memory leak.

Additionally, ni_usb_setup_init() returns 0 on failure, which causes
ni_usb_init() to return -EFAULT, an inappropriate error code for this
situation.

Fix the leak by freeing writes in the error path. Modify
ni_usb_setup_init() to return -EINVAL on failure and propagate this
error code in ni_usb_init().

Fixes: 4e127de14f ("staging: gpib: Add National Instruments USB GPIB driver")
Suggested-by: Greg KH <gregkh@linuxfoundation.org>
Suggested-by: Dave Penkler <dpenkler@gmail.com>
Co-developed-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
Link: https://patch.msgid.link/20251230034546.929452-1-zilin@seu.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-16 16:31:43 +01:00
Dan Carpenter
484e622522 gpib: Fix error code in ni_usb_write_registers() 
If ni_usb_receive_bulk_msg() succeeds but without reading 16 bytes, then
the error code needs to be set.  The current code returns success.

Fixes: 4e127de14f ("staging: gpib: Add National Instruments USB GPIB driver")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/aSlMpbE4IrQuBGFS@stanley.mountain
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-16 16:31:39 +01:00
Dan Carpenter
96118565d2 gpib: Fix error code in ibonline() 
This accidentally returns 1 on error, but it should return negative
error codes.

Fixes: 9dde4559e9 ("staging: gpib: Add GPIB common core driver")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/aSlMnaT1M104NJb2@stanley.mountain
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2026-01-16 16:31:31 +01:00
Adam Quandour
1520007aa3 staging: gpib: Clean-up commented-out code 
Remove unused code.

Signed-off-by: Adam Quandour <adam.quandour@gmail.com>
Link: https://patch.msgid.link/20251124192048.290425-1-adam.quandour@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2025-11-26 14:28:19 +01:00
Dave Penkler
e6ab504633 staging: gpib: Destage gpib 
Move the gpib drivers out of staging and into the "real" part of the
kernel.  This entails:

 - Remove the gpib Kconfig menu and Makefile build rule from staging.
 - Remove gpib/uapi from the header file search path in subdir-ccflags
   of the gpib Makefile
 - move the gpib/uapi files to include/uapi/linux
 - Move the gpib tree out of staging to drivers.
 - Remove the word "Linux" from the gpib Kconfig file.
 - Add the gpib Kconfig menu and Makefile build rule to drivers

Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Link: https://patch.msgid.link/20251117144021.23569-5-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2025-11-24 17:52:11 +01:00