Skip to content

Commit 19c8d0e

Browse files
committed
Input: ff-core - make use of __free() cleanup facility
Annotate allocated memory with __free(kfree) to simplify the code and make sure memory is released appropriately. Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20241107071538.195340-3-dmitry.torokhov@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 3d11c09 commit 19c8d0e

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

drivers/input/ff-core.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@ EXPORT_SYMBOL_GPL(input_ff_event);
290290
*/
291291
int input_ff_create(struct input_dev *dev, unsigned int max_effects)
292292
{
293-
struct ff_device *ff;
294-
size_t ff_dev_size;
295293
int i;
296294

297295
if (!max_effects) {
@@ -304,25 +302,19 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects)
304302
return -EINVAL;
305303
}
306304

307-
ff_dev_size = struct_size(ff, effect_owners, max_effects);
308-
if (ff_dev_size == SIZE_MAX) /* overflow */
309-
return -EINVAL;
310-
311-
ff = kzalloc(ff_dev_size, GFP_KERNEL);
305+
struct ff_device *ff __free(kfree) =
306+
kzalloc(struct_size(ff, effect_owners, max_effects),
307+
GFP_KERNEL);
312308
if (!ff)
313309
return -ENOMEM;
314310

315-
ff->effects = kcalloc(max_effects, sizeof(struct ff_effect),
316-
GFP_KERNEL);
317-
if (!ff->effects) {
318-
kfree(ff);
311+
ff->effects = kcalloc(max_effects, sizeof(*ff->effects), GFP_KERNEL);
312+
if (!ff->effects)
319313
return -ENOMEM;
320-
}
321314

322315
ff->max_effects = max_effects;
323316
mutex_init(&ff->mutex);
324317

325-
dev->ff = ff;
326318
dev->flush = input_ff_flush;
327319
dev->event = input_ff_event;
328320
__set_bit(EV_FF, dev->evbit);
@@ -335,6 +327,8 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects)
335327
if (test_bit(FF_PERIODIC, ff->ffbit))
336328
__set_bit(FF_RUMBLE, dev->ffbit);
337329

330+
dev->ff = no_free_ptr(ff);
331+
338332
return 0;
339333
}
340334
EXPORT_SYMBOL_GPL(input_ff_create);

0 commit comments

Comments
 (0)