From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F0B8298CC4; Tue, 21 Jul 2026 21:59:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784671155; cv=none; b=IuoIJJQhXy0Fz62Qn29VACQjtusDTaaLJOC5JtO1FOoF+XhumnFYRk+Xk14pNSSk2S9/eFeQjaXDCZ4x4NhkMHiPAlFQn8ZpymtCZAVVAT6wM1dgY3lsT7rvM0orwTBumkUYCV1EAbbdD5nPrhKOEPUM11qLsB7JXzW2yE0QYHI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784671155; c=relaxed/simple; bh=rPdHaR4disdavUIbGpdZ5nXF+F7NmltZGYoIrZ+Xz0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oraW5++VSQhf0a2XBOc1jpALWAEdJpRBn4T7sYl/WPggioUyyq/MYs6CbYiE0aK+8JR1QFWulC3b3EV4Lbg/rEcJscItZDkaoJvZ14HOpV2hDP4uJ1BwSb9guvEpsmfkQfzmVwbcoMJLLFMuE63TWIPvBO2zPFGdRNwVWE+ujTM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zn1OS0Ox; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zn1OS0Ox" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 692431F000E9; Tue, 21 Jul 2026 21:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784671153; bh=6f5uhfP7FA5i2cSc5rqpSXNLJTCu4GBn1/6yC5156+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zn1OS0OxyNo4GE0/bsm/8bIyMk4mTFsMl+RWO1Jbhe+vZj85Ib63w2qYEDYrq4HpM WbpLBu69AZpsGQomp3P0nlsy+9MslW8giiVGEfoSTSgpEb/i9vSpv3umSJdGj71C2a smle82YUKTPJ/TMEbFoIb5LZXaBFiWm23S0FXLeE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Xu Rao , Alan Stern Subject: [PATCH 5.15 140/843] USB: storage: include US_FL_NO_SAME in quirks mask Date: Tue, 21 Jul 2026 17:16:15 +0200 Message-ID: <20260721152409.161797363@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152405.946368001@linuxfoundation.org> References: <20260721152405.946368001@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xu Rao commit 2c00e09e3f9f06f8434f5ea2ee6179ce46692ee6 upstream. usb_stor_adjust_quirks() parses the usb-storage.quirks module parameter into a new flag set and then applies it with the quirk mask to override built-in flags. The mask is meant to cover the flags that can be overridden by the module parameter. The 'k' quirk character sets US_FL_NO_SAME, but US_FL_NO_SAME is not included in the mask. As a result, the module parameter can set US_FL_NO_SAME, but it cannot clear a built-in US_FL_NO_SAME flag by providing an override entry that omits 'k'. Add US_FL_NO_SAME to the mask so that the module parameter can override it in the same way as the other supported flags. Fixes: 8010622c86ca ("USB: UAS: introduce a quirk to set no_write_same") Cc: stable Signed-off-by: Xu Rao Reviewed-by: Alan Stern Link: https://patch.msgid.link/3BCE5880F9A45C2E+20260602053842.2920137-1-raoxu@uniontech.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -488,7 +488,7 @@ void usb_stor_adjust_quirks(struct usb_d US_FL_INITIAL_READ10 | US_FL_WRITE_CACHE | US_FL_NO_ATA_1X | US_FL_NO_REPORT_OPCODES | US_FL_MAX_SECTORS_240 | US_FL_NO_REPORT_LUNS | - US_FL_ALWAYS_SYNC); + US_FL_ALWAYS_SYNC | US_FL_NO_SAME); p = quirks; while (*p) {