From patchwork Thu Apr 4 17:56:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13618116 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 894C912EBDC for ; Thu, 4 Apr 2024 17:56:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712253386; cv=none; b=DV2XqyQh4obGspWn5rC7mumn3CqVe/xhYjhr4jLE6dJMdYogaD6obVfAiT2i+Wwd+XYZ+UocRUfgdTS5pUI5Y5seWDHkgPBnwpR+SXfXKlNW6Xa2lYCgxKQSk+OHSxGNCxaRVzPIRZAj88/VMnBj/f0NtkqgGD6GBNfmL8Onrs8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712253386; c=relaxed/simple; bh=cpevCXhemU3AuNNOneQyUUUPZbMN1DTjK5rlZnT/TgY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=Rezc04qPZyV8B5vwKnBzcxQdm/x2g3uMKINI66HlrpWq0UFRfdFTU/pWkjBlmQmsKnJI/yhRNbLQ1yITW3YpddeinyWmS0S95BvzMPXFnTqppgxwGtR2E10ln093TYpaBI+dZHtMUiUO0gQ6qM6jTjcgfvVsvmfQh98M8DaLQPc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kVRo/NPI; arc=none smtp.client-ip=209.85.160.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kVRo/NPI" Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-430bf84977dso7185071cf.1 for ; Thu, 04 Apr 2024 10:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1712253382; x=1712858182; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=sICjXd/Iri+PbpHbTqI5EQVG9p15OT45zGLzvc441Ds=; b=kVRo/NPIsYEDTo7dRDjcph1d+0nfioAziBAyDwJriDnA2ie57cL4G45eARPtHUFIFn y8OfgNgJUgCV02krUo7/K3b1AdudaryOXsnrRaSQqQmMpiav06Gzu/AFB4lrjmw3u7JP IlVOCrvzBXiGnJOkD9BtBu7tLt5JLQ19gVo0g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712253382; x=1712858182; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sICjXd/Iri+PbpHbTqI5EQVG9p15OT45zGLzvc441Ds=; b=aT1s13KPp8xOUpU5K0Gjjf7zYS4tfd/4lI7I5q/CUclRYs4+N7YcreoXaZlVnqV+ln rXos+GMlK+Fd32kiSn5/5tDJPrlArA7S+B2hthfa0y/FfeCZtzgRLANO66GNrSpBCZas g3prIDh09queWJnyulYfmmO+arbDQWUT+6jEOtakqFesv0k7RivZ0xKg1v0CgzA2KnOW gOytiPvOdF7UMkEh7H0MvPMFEqZe9tyIFTs0itmGBrTyErrlAuQwyaPfqXBIAJkKM6L4 CtJtSyQr1kKn5yZa44z7opr5oGEXWdLYhyRyBMPAm1U5xtSd6YroX9S0N+uCrHy3WTTc AuFw== X-Gm-Message-State: AOJu0YziDh1M46T3KRPyZ4+bbCFfwlxvKV5C47+ACdTLWvmGS5/ecaF0 Muqo1xcijez2eXgFXblWoQP77KOZ8X9fOVA1r7TjAIj9I6mIEuJTArs7OwkUEQ== X-Google-Smtp-Source: AGHT+IFE+Z3rlRcNhzA+IuwKQ6WeJo2EAgoeoStIrtL8ZOFrx9Ar4+GDvQ/Pe0Azl40A50YTskqyDw== X-Received: by 2002:ac8:5d50:0:b0:432:f6ab:a948 with SMTP id g16-20020ac85d50000000b00432f6aba948mr3850833qtx.20.1712253382412; Thu, 04 Apr 2024 10:56:22 -0700 (PDT) Received: from denia.c.googlers.com (188.173.86.34.bc.googleusercontent.com. [34.86.173.188]) by smtp.gmail.com with ESMTPSA id cd15-20020a05622a418f00b00431801225d6sm7859494qtb.31.2024.04.04.10.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 10:56:21 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 04 Apr 2024 17:56:18 +0000 Subject: [PATCH v2] media: uvcvideo: Enforce alignment of frame and interval Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240404-uvc-align-v2-1-9e104b0ecfbd@chromium.org> X-B4-Tracking: v=1; b=H4sIAMHpDmYC/22NTQ6CMBBGr0K6dkwLiMSV9zAs2jKlk0BrptJoC He3snb5Xr6fTSRkwiRu1SYYMyWKoUB9qoT1OkwINBYWtawbeZEK1mxBzzQF6Jwr1nT9qI0oeaM TgmEdrC+NsM5zkU9GR+/j4DEU9pRekT/HX1Y/+286K1Ag3VU12Jq+tc3deo4Lrcs58iSGfd+/h 3jraboAAAA= To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 Struct uvc_frame and interval (u32*) are packaged together on streaming->formats on a single contiguous allocation. Right now they allocated right after uvc_format, without taking into consideration their required alignment. This is working fine because both structures have a field with a pointer, but it will stop working when the sizeof() of any of those structs is not a multiple of the sizeof(void*). Enforce that alignment during the allocation. Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- This is better than 3 allocations, and do not have any performance penalty. I have tried this patch printing the size and the address of the pointers in the old and the new mode, and it looks the same. [ 2.235223] drivers/media/usb/uvc/uvc_driver.c:694 uvc_parse_streaming 432 [ 2.235249] drivers/media/usb/uvc/uvc_driver.c:704 uvc_parse_streaming 432 [ 2.235256] drivers/media/usb/uvc/uvc_driver.c:714 uvc_parse_streaming 00000000d32087cc 00000000d3803788 [ 2.235265] drivers/media/usb/uvc/uvc_driver.c:720 uvc_parse_streaming 00000000d32087cc 00000000d3803788 --- Changes in v2: Thanks Laurent. - Enforce alignment during allocation instead of using __aligned() macros. - Link to v1: https://lore.kernel.org/r/20230501-uvc-align-v1-1-0f713e4b84c3@chromium.org --- drivers/media/usb/uvc/uvc_driver.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) --- base-commit: 58390c8ce1bddb6c623f62e7ed36383e7fa5c02f change-id: 20230501-uvc-align-6ff202b68dab Best regards, diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 7aefa76a42b31..7d9844ba3b205 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -663,16 +663,26 @@ static int uvc_parse_streaming(struct uvc_device *dev, goto error; } - size = nformats * sizeof(*format) + nframes * sizeof(*frame) - + nintervals * sizeof(*interval); + /* + * Allocate memory for the formats, the frames and the intervals, + * plus any required padding to guarantee that everything has the + * correct alignment. + */ + size = nformats * sizeof(*format); + size = ALIGN(size, __alignof__(*frame)) + nframes * sizeof(*frame); + size = ALIGN(size, __alignof__(*interval)) + + nintervals * sizeof(*interval); + format = kzalloc(size, GFP_KERNEL); - if (format == NULL) { + if (!format) { ret = -ENOMEM; goto error; } - frame = (struct uvc_frame *)&format[nformats]; - interval = (u32 *)&frame[nframes]; + frame = (void *)format + nformats * sizeof(*format); + frame = PTR_ALIGN(frame, __alignof__(*frame)); + interval = (void *)frame + nframes * sizeof(*frame); + interval = PTR_ALIGN(interval, __alignof__(*interval)); streaming->format = format; streaming->nformats = nformats;